Changeset 38

Timestamp:

01/20/08 12:02:25 (11 months ago)

Author:

cinc

Message:

Fix for ticket #12. Toolbar buttons used a predefined bg color. Now they are painted with the launcharea color. Moved some defines to a new include file.

Files:

• trunk/Menufolder/c/cwlauncharea.cpp (modified) (7 diffs)

trunk/Menufolder/c/cwlauncharea.cpp

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 1996/2007
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
+  This file is (C) Chris Wohlgemuth 1996/2008
+
+  This file is copyrighted.
+
+  For licensing contact cinc-ml@netlabs.org
+
+  No use or copying without prior permission.
+
+*/
 
 #define INCL_DOS
@@ -40 +32 @@
 #include "sys_funcs.h"
 
-#define CW_LAUNCHAREA       "CW_LAUNCHAREA"
-#define LAUNCHAREA_DATASIZE 4
+/* launcharea specific defines */
+#include "cwlauncharea_inc.h"
+
+
 /* Vars for launcharea class */
 ULONG   g_ulStaticDataOffset=0;
@@ -49 +43 @@
 static BOOL fInitCWLADone=FALSE;
 
-#define LP_USEOBJECTASPARAM  0x00000001
+//#define LP_USEOBJECTASPARAM  0x00000001
+
+/* This one should go in an include file */
 #define WPSWIZARD_TBID "<WPSWIZARD_TOOLBAR>"
-
-#define VIEW_LAUNCHAREA  WPMENUID_USER+0x1000
-//#define VIEW_LAUNCHAREA  0x1000
 
 #define  WM_NEWBUBBLE   WM_USER+100 //Use ATOM later
@@ -71 +64 @@
 static ULONG ulIconSize=40;
 static HAB g_hab;
+
+/* launcharea SOM stuff */
 #include "cwlauncharea.hh"
 
@@ -159 +154 @@
       }
 #endif
-      WinFillRect(hps, &rcl, CLR_PALEGRAY /*0x00ff0000*/);
+      WinFillRect(hps, &rcl, CLR_LAUNCHAREA /*CLR_PALEGRAY*/);
       if(fHilite)
         WinDrawBorder(hps, &rcl, 2, 2, 0, 0, 0x800);
@@ -660 +655 @@
 }
 
-
+/*
+  Window procedure handling the launcharea window class (CW_LAUNCHAREA). Because the
+  buttons on the launcharea are user buttons all paint messages for the buttons will
+  end up here, too.
+ */
 static MRESULT EXPENTRY fnwpLaunchAreaProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
 {
@@ -786 +785 @@
         HPS hps=WinBeginPaint(hwnd,NULLHANDLE, &rcl);
 
-        WinFillRect(hps, &rcl, SYSCLR_DIALOGBACKGROUND);
+        WinFillRect(hps, &rcl, CLR_LAUNCHAREA);
         lp=(CWLaunchArea*)WinQueryWindowULong(hwnd,QWL_USER);
         if(somIsObj(lp)) {