Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now

compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

docs/symbols.txt

@@ -4,17 +4,18 @@ GUIs:
 -----
 
 __X__           any X, but not GTK
-__WXMOTIF__       Motif
+__WXMOTIF__     Motif
-__XT__          Xt; mutually exclusive with WX_MOTIF (?)
+__WXXT__        Xt; mutually exclusive with WX_MOTIF (?)
-__WXGTK__         GTK
+__WXGTK__       GTK
-__XVIEW__       Obsolete!
+__WXMSW__       Any Windows
-__WXMSW__     Any Windows
+__WXMAC__       MacOS
-__MAC__         MacOS
 __UNIX__        any Unix
+__WINDOWS__     any Windows
 __WIN95__       GUI for Windows 95 and above; NT 4.0 and above.
 __WIN32__       WIN32 API
 __NT__          Windows NT
-__CURSES__      CURSES
+__WXCURSES__    CURSES
+__WXSTUBS__     Stubbed version ('template' wxWin implementation)
 
 In fact, they should better all start with __WX instead of __ only. 
 The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__

include/wx/accel.h

@@ -0,0 +1,19 @@
+#ifndef _WX_ACCEL_H_BASE_
+#define _WX_ACCEL_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/accel.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/accel.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/accel.h"
+#elif defined(__WXQT__)
+#include "wx/qt/accel.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/accel.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/accel.h"
+#endif
+
+#endif
+    // _WX_ACCEL_H_BASE_

include/wx/app.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __APPH_BASE__
+#ifndef _WX_APP_H_BASE_
-#define __APPH_BASE__
+#define _WX_APP_H_BASE_
 
 #ifdef __WXMSW__
 class WXDLLEXPORT wxApp;
@@ -26,14 +26,17 @@ typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't
 #if defined(__WXMSW__)
 #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/app.h"
+#include "wx/motif/app.h"
 #elif defined(__WXQT__)
 #include "wx/qt/app.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/app.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/app.h"
 #endif
 
-
 // Having a global instance of this class allows
 // wxApp to be aware of the app creator function.
 // wxApp can then call this function to create a new
@@ -72,4 +75,4 @@ int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 
 
 #endif
-    // __APPH_BASE__
+    // _WX_APP_H_BASE_

include/wx/bitmap.h

@@ -1,15 +1,19 @@
-#ifndef __BITMAPH_BASE__
+#ifndef _WX_BITMAP_H_BASE_
-#define __BITMAPH_BASE__
+#define _WX_BITMAP_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/bitmap.h"
+#include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bitmap.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/bitmap.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/bitmap.h"
 #endif
 
 #endif
-    // __BITMAPH_BASE__
+    // _WX_BITMAP_H_BASE_

include/wx/bmpbuttn.h

@@ -1,14 +1,18 @@
-#ifndef __BMPBUTTONH_BASE__
+#ifndef _WX_BMPBUTTON_H_BASE_
-#define __BMPBUTTONH_BASE__
+#define _WX_BMPBUTTON_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/bmpbuttn.h"
+#include "wx/motif/bmpbuttn.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bmpbuttn.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bmpbuttn.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/bmpbuttn.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/bmpbuttn.h"
 #endif
 
 #endif

include/wx/brush.h

@@ -1,15 +1,19 @@
-#ifndef __BRUSHH_BASE__
+#ifndef _WX_BRUSH_H_BASE_
-#define __BRUSHH_BASE__
+#define _WX_BRUSH_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/brush.h"
+#include "wx/motif/brush.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
 #elif defined(__WXQT__)
 #include "wx/qt/brush.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/brush.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/brush.h"
 #endif
 
 #endif
-    // __BRUSHH_BASE__
+    // _WX_BRUSH_H_BASE_

include/wx/button.h

@@ -1,15 +1,19 @@
-#ifndef __BUTTONH_BASE__
+#ifndef _WX_BUTTON_H_BASE_
-#define __BUTTONH_BASE__
+#define _WX_BUTTON_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/button.h"
+#include "wx/motif/button.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/button.h"
 #elif defined(__WXQT__)
 #include "wx/qt/button.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/button.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/button.h"
 #endif
 
 #endif
-    // __BUTTONH_BASE__
+    // _WX_BUTTON_H_BASE_

include/wx/checkbox.h

@@ -1,15 +1,19 @@
-#ifndef __CHECKBOXH_BASE__
+#ifndef _WX_CHECKBOX_H_BASE_
-#define __CHECKBOXH_BASE__
+#define _WX_CHECKBOX_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/checkbox.h"
+#include "wx/motif/checkbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/checkbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/checkbox.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/checkbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/checkbox.h"
 #endif
 
 #endif
-    // __CHECKBOXH_BASE__
+    // _WX_CHECKBOX_H_BASE_

include/wx/checklst.h

@@ -0,0 +1,19 @@
+#ifndef _WX_CHECKLST_H_BASE_
+#define _WX_CHECKLST_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/checklst.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/checklst.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/checklst.h"
+#elif defined(__WXQT__)
+#include "wx/qt/checklst.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/checklst.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/checklst.h"
+#endif
+
+#endif
+    // _WX_CHECKLST_H_BASE_

include/wx/choicdlg.h

@@ -1,7 +1,7 @@
-#ifndef __CHOICDLGH_BASE__
+#ifndef _WX_CHOICDLG_H_BASE_
-#define __CHOICDLGH_BASE__
+#define _WX_CHOICDLG_H_BASE_
 
 #include "wx/generic/choicdgg.h"
 
 #endif
-    // __CHOICDLGH_BASE__
+    // _WX_CHOICDLG_H_BASE_

include/wx/choice.h

@@ -1,15 +1,19 @@
-#ifndef __CHOICEH_BASE__
+#ifndef _WX_CHOICE_H_BASE_
-#define __CHOICEH_BASE__
+#define _WX_CHOICE_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/choice.h"
+#include "wx/motif/choice.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/choice.h"
 #elif defined(__WXQT__)
 #include "wx/qt/choice.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/choice.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/choice.h"
 #endif
 
 #endif
-    // __CHOICEH_BASE__
+    // _WX_CHOICE_H_BASE_

include/wx/clipbrd.h

@@ -1,15 +1,19 @@
-#ifndef __CLIPBRDH_BASE__
+#ifndef _WX_CLIPBRD_H_BASE_
-#define __CLIPBRDH_BASE__
+#define _WX_CLIPBRD_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/clipbrd.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/clipbrd.h"
+#include "wx/motif/clipbrd.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/clipbrd.h"
 #elif defined(__WXQT__)
 #include "wx/gtk/clipbrd.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/clipbrd.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/clipbrd.h"
 #endif
 
 #endif
-    // __CLIPBRDH_BASE__
+    // _WX_CLIPBRD_H_BASE_

include/wx/cmndata.h

@@ -9,13 +9,16 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CMNDATAH_BASE__
+#ifndef _WX_CMNDATA_H_BASE_
-#define __CMNDATAH_BASE__
+#define _WX_CMNDATA_H_BASE_
 
 #ifdef __GNUG__
 #pragma interface "cmndata.h"
 #endif
 
+#include "wx/font.h"
+#include "wx/colour.h"
+
 class WXDLLEXPORT wxColourData: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxColourData)
@@ -220,4 +223,4 @@ class WXDLLEXPORT wxPageSetupData: public wxObject
 
 
 #endif
-    // __CMNDATAH_BASE__
+    // _WX_CMNDATA_H_BASE_

include/wx/colordlg.h

@@ -1,5 +1,5 @@
-#ifndef __COLORDLGH_BASE__
+#ifndef _WX_COLORDLG_H_BASE_
-#define __COLORDLGH_BASE__
+#define _WX_COLORDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/colordlg.h"
@@ -9,7 +9,11 @@
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/colrdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/colrdlgg.h"
 #endif
 
 #endif
-    // __COLORDLGH_BASE__
+    // _WX_COLORDLG_H_BASE_

include/wx/colour.h

@@ -0,0 +1,19 @@
+#ifndef _WX_COLOUR_H_BASE_
+#define _WX_COLOUR_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/colour.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/colour.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/colour.h"
+#elif defined(__WXQT__)
+#include "wx/qt/colour.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/colour.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/colour.h"
+#endif
+
+#endif
+    // _WX_COLOUR_H_BASE_

include/wx/combobox.h

@@ -1,15 +1,19 @@
-#ifndef __COMBOBOXH_BASE__
+#ifndef _WX_COMBOBOX_H_BASE_
-#define __COMBOBOXH_BASE__
+#define _WX_COMBOBOX_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/combobox.h"
+#include "wx/motif/combobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/combobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/combobox.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/combobox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/combobox.h"
 #endif
 
 #endif
-    // __COMBOBOXH_BASE__
+    // _WX_COMBOBOX_H_BASE_

include/wx/config.h

@@ -11,8 +11,8 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   _wxCONFIG_H
+#ifndef   _WX_CONFIG_H_
-#define   _wxCONFIG_H
+#define   _WX_CONFIG_H_
 
 #ifdef __GNUG__
 #pragma interface "config.h"
@@ -237,5 +237,5 @@ private:
   #define wxConfig  wxFileConfig
 #endif
 
-#endif  //_wxCONFIG_H
+#endif  // _WX_CONFIG_H_
 

include/wx/control.h

@@ -1,15 +1,19 @@
-#ifndef __CONTROLH_BASE__
+#ifndef _WX_CONTROL_H_BASE_
-#define __CONTROLH_BASE__
+#define _WX_CONTROL_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/control.h"
+#include "wx/motif/control.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/control.h"
 #elif defined(__WXQT__)
 #include "wx/qt/control.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/control.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/control.h"
 #endif
 
 #endif
-    // __CONTROLH_BASE__
+    // _WX_CONTROL_H_BASE_

include/wx/cursor.h

@@ -1,15 +1,19 @@
-#ifndef __CURSORH_BASE__
+#ifndef _WX_CURSOR_H_BASE_
-#define __CURSORH_BASE__
+#define _WX_CURSOR_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/cursor.h"
+#include "wx/motif/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
 #elif defined(__WXQT__)
 #include "wx/qt/cursor.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/cursor.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/cursor.h"
 #endif
 
 #endif
-    // __CURSORH_BASE__
+    // _WX_CURSOR_H_BASE_

include/wx/date.h

@@ -10,8 +10,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WXDATEH__
+#ifndef _WX_DATE_H_
-#define __WXDATEH__
+#define _WX_DATE_H_
 
 #ifdef __GNUG__
 #pragma interface "date.h"
@@ -128,4 +128,4 @@ class WXDLLEXPORT wxDate: public wxObject
 
 #endif
 #endif
-    // __WXDATEH__
+    // _WX_DATE_H_

include/wx/datstrm.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DATSTREAMH__
+#ifndef _WX_DATSTREAM_H_
-#define __DATSTREAMH__
+#define _WX_DATSTREAM_H_
 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
@@ -45,4 +45,4 @@ class wxDataOutputStream: public wxFilterOutputStream {
 };
 
 #endif
-    // __DATSTREAMH__
+    // _WX_DATSTREAM_H_

include/wx/dc.h

@@ -1,15 +1,19 @@
-#ifndef __DCH_BASE__
+#ifndef _WX_DC_H_BASE_
-#define __DCH_BASE__
+#define _WX_DC_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dc.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dc.h"
+#include "wx/motif/dc.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dc.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dc.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dc.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dc.h"
 #endif
 
 #endif
-    // __DCH_BASE__
+    // _WX_DC_H_BASE_

include/wx/dcclient.h

@@ -1,15 +1,19 @@
-#ifndef __DCCLIENTH_BASE__
+#ifndef _WX_DCCLIENT_H_BASE_
-#define __DCCLIENTH_BASE__
+#define _WX_DCCLIENT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dcclient.h"
+#include "wx/motif/dcclient.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcclient.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcclient.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcclient.h"
 #endif
 
 #endif
-    // __DCCLIENTH_BASE__
+    // _WX_DCCLIENT_H_BASE_

include/wx/dcmemory.h

@@ -1,15 +1,19 @@
-#ifndef __DCMEMORYH_BASE__
+#ifndef _WX_DCMEMORY_H_BASE_
-#define __DCMEMORYH_BASE__
+#define _WX_DCMEMORY_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dcmemory.h"
+#include "wx/motif/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcmemory.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcmemory.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcmemory.h"
 #endif
 
 #endif
-    // __DCMEMORYH_BASE__
+    // _WX_DCMEMORY_H_BASE_

include/wx/dcprint.h

@@ -1,9 +1,9 @@
-#ifndef __DCPRINTH_BASE__
+#ifndef _WX_DCPRINT_H_BASE_
-#define __DCPRINTH_BASE__
+#define _WX_DCPRINT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcprint.h"
 #endif
 
 #endif
-    // __DCPRINTH_BASE__
+    // _WX_DCPRINT_H_BASE_

include/wx/dcscreen.h

@@ -1,15 +1,19 @@
-#ifndef __DCSCREENH_BASE__
+#ifndef _WX_DCSCREEN_H_BASE_
-#define __DCSCREENH_BASE__
+#define _WX_DCSCREEN_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcscreen.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dcscreen.h"
+#include "wx/motif/dcscreen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcscreen.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dcscreen.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcscreen.h"
 #endif
 
 #endif
-    // __DCSCREENH_BASE__
+    // _WX_DCSCREEN_H_BASE_

include/wx/dde.h

@@ -1,15 +1,19 @@
-#ifndef __DDEH_BASE__
+#ifndef _WX_DDE_H_BASE_
-#define __DDEH_BASE__
+#define _WX_DDE_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dde.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dde.h"
+#include "wx/motif/dde.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dde.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dde.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dde.h"
 #endif
 
 #endif
-    // __DDEH_BASE__
+    // _WX_DDE_H_BASE_

include/wx/debug.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __WXDEBUGH__
+#ifndef   _WX_DEBUG_H_
-#define   __WXDEBUGH__
+#define   _WX_DEBUG_H_
 
 #include  <assert.h>
 
@@ -99,5 +99,5 @@
 
 //@}
 
-#endif  // __WXDEBUGH__
+#endif  // _WX_DEBUG_H_
 

include/wx/defs.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DEFSH__
+#ifndef _WX_DEFS_H_
-#define __DEFSH__
+#define _WX_DEFS_H_
 
 #ifdef __GNUG__
 #pragma interface "defs.h"
@@ -48,14 +48,10 @@
 #endif
 #if defined(__WXMOTIF__)
 # define __X__
-#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
-# ifndef __WXMSW__
-#  define __WXMSW__
-# endif
 #endif
 
 // wxWindows checks for WIN32, not __WIN32__
-#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__))
+#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))
 #define __WIN32__
 #endif
 
@@ -71,11 +67,11 @@
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
-      !defined(__MAC__) && !defined(__X__) && !defined(__WXQT__)
+      !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
-#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__|__QT__]"
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"
 #endif
 
-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;
@@ -236,10 +232,6 @@ enum  ErrCode
 #endif
 
 #ifndef __UNIX__                     // Windows
-  #ifndef __WXMSW__
-    #define __WXMSW__
-  #endif
-
   #if   defined(_MSC_VER)
     #define __VISUALC__
   #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
@@ -257,7 +249,7 @@ enum  ErrCode
 #elif   defined(__WXMSW__)
   #define FILE_PATH_SEPARATOR   ('\\')
 #else
-  #error "don't know path separator for this platform"
+  #define FILE_PATH_SEPARATOR   ('/')
 #endif
 
 // ----------------------------------------------------------------------------
@@ -776,20 +768,23 @@ enum _Virtual_keycodes {
 // OS mnemonics -- Identify the running OS (useful for Windows)
 // [Not all platforms are currently available or supported]
 enum {
-  wxCURSES,
+  wxUNKNOWN_PLATFORM,
+  wxCURSES,     // Text-only CURSES
   wxXVIEW_X,	// Sun's XView OpenLOOK toolkit
   wxMOTIF_X,	// OSF Motif 1.x.x
-  wxCOSE_X,	// OSF Common Desktop Environment
+  wxCOSE_X,	    // OSF Common Desktop Environment
   wxNEXTSTEP,	// NeXTStep
   wxMACINTOSH,	// Apple System 7
-  wxGEOS,	// GEOS
+  wxGTK,	    // GTK
-  wxOS2_PM,	// OS/2 Workplace
+  wxQT,	        // Qt
+  wxGEOS,	    // GEOS
+  wxOS2_PM,	    // OS/2 Workplace
   wxWINDOWS,	// Windows or WfW
   wxPENWINDOWS,	// Windows for Pen Computing
   wxWINDOWS_NT,	// Windows NT
-  wxWIN32S,	// Windows 32S API
+  wxWIN32S,	    // Windows 32S API
-  wxWIN95,	// Windows 95
+  wxWIN95,	    // Windows 95
-  wxWIN386	// Watcom 32-bit supervisor modus
+  wxWIN386	    // Watcom 32-bit supervisor modus
 };
 
 // Printing
@@ -882,4 +877,4 @@ typedef int (__stdcall *WXFARPROC)();
 #endif
 
 #endif
-    // __WXDEFSH__
+    // _WX_DEFS_H_

include/wx/dialog.h

@@ -1,15 +1,19 @@
-#ifndef __DIALOGH_BASE__
+#ifndef _WX_DIALOG_H_BASE_
-#define __DIALOGH_BASE__
+#define _WX_DIALOG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dialog.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dialog.h"
+#include "wx/motif/dialog.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dialog.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dialog.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dialog.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dialog.h"
 #endif
 
 #endif
-    // __DIALOGH_BASE__
+    // _WX_DIALOG_H_BASE_

include/wx/dirdlg.h

@@ -1,15 +1,19 @@
-#ifndef __DIRDLGH_BASE__
+#ifndef _WX_DIRDLG_H_BASE_
-#define __DIRDLGH_BASE__
+#define _WX_DIRDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/dirdlg.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/dirdlg.h"
+#include "wx/motif/dirdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dirdlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dirdlg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dirdlg.h"
 #endif
 
 #endif
-    // __DIRDLGH_BASE__
+    // _WX_DIRDLG_H_BASE_

include/wx/dnd.h

@@ -1,5 +1,5 @@
-#ifndef __DNDH_BASE__
+#ifndef _WX_DND_H_BASE_
-#define __DNDH_BASE__
+#define _WX_DND_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/ole/dropsrc.h"
@@ -10,7 +10,11 @@
 #include "wx/gtk/dnd.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dnd.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/dnd.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dnd.h"
 #endif
 
 #endif
-    // __DNDH_BASE__
+    // _WX_DND_H_BASE_

include/wx/docview.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __DOCH__
+#ifndef _WX_DOCH__
-#define __DOCH__
+#define _WX_DOCH__
 
 #ifdef __GNUG__
 #pragma interface "docview.h"

include/wx/dynlib.h

@@ -1,5 +1,5 @@
-#ifndef __DYNLIB_H__
+#ifndef _WX_DYNLIB_H__
-#define __DYNLIB_H__
+#define _WX_DYNLIB_H__
 
 #ifdef __GNUG__
 #pragma interface

include/wx/event.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __EVENTH__
+#ifndef _WX_EVENTH__
-#define __EVENTH__
+#define _WX_EVENTH__
 
 #ifdef __GNUG__
 #pragma interface "event.h"
@@ -395,6 +395,7 @@ class WXDLLEXPORT wxScrollEvent: public wxCommandEvent
  wxEVT_NC_RIGHT_DCLICK,
 */
 
+class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxMouseEvent: public wxEvent
 {
   DECLARE_DYNAMIC_CLASS(wxMouseEvent)
@@ -1268,4 +1269,4 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
  { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, NULL },\
 
 #endif
-	// __EVENTH__
+	// _WX_EVENTH__

include/wx/expr.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __EXPRH__
+#ifndef _WX_EXPRH__
-#define __EXPRH__
+#define _WX_EXPRH__
 
 #include <math.h>
 #include <stdlib.h>
@@ -126,4 +126,4 @@ void syntax_error();
 #endif
 
 #endif
-	// __EXPRH__
+	// _WX_EXPRH__

include/wx/file.h

@@ -175,4 +175,4 @@ private:
 };
 
 #endif
-        // __FILEH__
+        // _WX_FILEH__

include/wx/filedlg.h

@@ -1,15 +1,19 @@
-#ifndef __FILEDLGH_BASE__
+#ifndef _WX_FILEDLG_H_BASE_
-#define __FILEDLGH_BASE__
+#define _WX_FILEDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/filedlg.h"
+#include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/filedlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/filedlg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/filedlg.h"
 #endif
 
 #endif
-    // __FILEDLGH_BASE__
+    // _WX_FILEDLG_H_BASE_

include/wx/filefn.h

@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __FILEFNH__
+#ifndef   _FILEFN_H_
-#define   __FILEFNH__
+#define   _FILEFN_H_
 
 #ifdef __GNUG__
 #pragma interface "filefn.h"
@@ -204,5 +204,5 @@ class WXDLLEXPORT wxPathList: public wxStringList
 };
 
 #endif
-  // __FILEFNH__
+  // _WX_FILEFN_H_
 

include/wx/font.h

@@ -1,15 +1,19 @@
-#ifndef __FONTH_BASE__
+#ifndef _WX_FONT_H_BASE_
-#define __FONTH_BASE__
+#define _WX_FONT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/font.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/font.h"
+#include "wx/motif/font.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/font.h"
 #elif defined(__WXQT__)
 #include "wx/qt/font.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/font.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/font.h"
 #endif
 
 #endif
-    // __FONTH_BASE__
+    // _WX_FONT_H_BASE_

include/wx/fontdlg.h

@@ -1,5 +1,5 @@
-#ifndef __FONTDLGH_BASE__
+#ifndef _WX_FONTDLG_H_BASE_
-#define __FONTDLGH_BASE__
+#define _WX_FONTDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
@@ -15,7 +15,15 @@
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #   define classwxFontDialog classwxGenericFontDialog
+#elif defined(__WXMAC__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog
+#elif defined(__WXSTUBS__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog
 #endif
 
 #endif
-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_

include/wx/frame.h

@@ -1,15 +1,19 @@
-#ifndef __FRAMEH_BASE__
+#ifndef _WX_FRAME_H_BASE_
-#define __FRAMEH_BASE__
+#define _WX_FRAME_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/frame.h"
+#include "wx/motif/frame.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
 #elif defined(__WXQT__)
 #include "wx/qt/frame.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/frame.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/frame.h"
 #endif
 
 #endif
-    // __FRAMEH_BASE__
+    // _WX_FRAME_H_BASE_

include/wx/fstream.h

@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXFSTREAM_H__
+#ifndef _WX_WXFSTREAM_H__
-#define __WXFSTREAM_H__
+#define _WX_WXFSTREAM_H__
 
 #include <wx/object.h>
 #include <wx/string.h>

include/wx/gauge.h

@@ -1,15 +1,19 @@
-#ifndef __GAUGEH_BASE__
+#ifndef _WX_GAUGE_H_BASE_
-#define __GAUGEH_BASE__
+#define _WX_GAUGE_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/gauge.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/gauge.h"
+#include "wx/motif/gauge.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gauge.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gauge.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/gauge.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/gauge.h"
 #endif
 
 #endif
-    // __GAUGEH_BASE__
+    // _WX_GAUGE_H_BASE_

include/wx/gdicmn.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GDICMNH__
+#ifndef _WX_GDICMNH__
-#define __GDICMNH__
+#define _WX_GDICMNH__
 
 #ifdef __GNUG__
 #pragma interface "gdicmn.h"
@@ -19,17 +19,9 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"
+#include "wx/string.h"
 #include "wx/setup.h"
-
+#include "wx/colour.h"
-#ifdef __WXMSW__
-#include "wx/msw/colour.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/colour.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
-#endif
 
 // Standard cursors
 typedef enum {
@@ -192,6 +184,8 @@ class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxColour;
+class WXDLLEXPORT wxString;
 
 // Management of pens, brushes and fonts
 class WXDLLEXPORT wxPenList: public wxList
@@ -359,4 +353,4 @@ class WXDLLEXPORT wxResourceCache: public wxList
 };
 
 #endif
-    // __GDICMNH__
+    // _WX_GDICMNH__

include/wx/gdiobj.h

@@ -1,15 +1,19 @@
-#ifndef __GDIOBJH_BASE__
+#ifndef _WX_GDIOBJ_H_BASE_
-#define __GDIOBJH_BASE__
+#define _WX_GDIOBJ_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/gdiobj.h"
+#include "wx/motif/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gdiobj.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/gdiobj.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/gdiobj.h"
 #endif
 
 #endif
-    // __GDIOBJH_BASE__
+    // _WX_GDIOBJ_H_BASE_

include/wx/grid.h

@@ -1,5 +1,5 @@
-#ifndef __GRIDH_BASE__
+#ifndef _WX_GRID_H_BASE_
-#define __GRIDH_BASE__
+#define _WX_GRID_H_BASE_
 
 #include "wx/generic/gridg.h"
 
@@ -8,4 +8,4 @@
 #endif
 
 #endif
-    // __GRIDH_BASE__
+    // _WX_GRID_H_BASE_

include/wx/hash.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __WXHASHH__
+#ifndef _WX_WXHASHH__
-#define __WXHASHH__
+#define _WX_WXHASHH__
 
 #ifdef __GNUG__
 #pragma interface "hash.h"
@@ -95,4 +95,4 @@ class WXDLLEXPORT wxHashTable: public wxObject
 };
 
 #endif
-    // __WXHASHH__
+    // _WX_WXHASHH__

include/wx/help.h

@@ -1,5 +1,5 @@
-#ifndef __HELPH_BASE__
+#ifndef _WX_HELP_H_BASE_
-#define __HELPH_BASE__
+#define _WX_HELP_H_BASE_
 
 #ifdef __WXMSW__
 #include "wx/msw/helpwin.h"
@@ -21,4 +21,4 @@
 #endif
 
 #endif
-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_

include/wx/helpbase.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __HELPBASEH__
+#ifndef _WX_HELPBASEH__
-#define __HELPBASEH__
+#define _WX_HELPBASEH__
 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"
@@ -48,4 +48,4 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
 
 #endif // USE_HELP
 #endif
-    // __HELPBASEH__
+    // _WX_HELPBASEH__

include/wx/helphtml.h

@@ -1,7 +1,7 @@
-#ifndef __HELPHTMLH_BASE__
+#ifndef _WX_HELPHTML_H_BASE_
-#define __HELPHTMLH_BASE__
+#define _WX_HELPHTML_H_BASE_
 
 #include "wx/generic/helphtml.h"
 
 #endif
-    // __HELPHTMLH_BASE__
+    // _WX_HELPHTML_H_BASE_

include/wx/helpwin.h

@@ -1,7 +1,7 @@
-#ifndef __HELPWINH_BASE__
+#ifndef _WX_HELPWIN_H_BASE_
-#define __HELPWINH_BASE__
+#define _WX_HELPWIN_H_BASE_
 
 #include "wx/msw/helpwin.h"
 
 #endif
-    // __HELPWINH_BASE__
+    // _WX_HELPWIN_H_BASE_

include/wx/helpxlp.h

@@ -1,7 +1,7 @@
-#ifndef __HELPXLPH_BASE__
+#ifndef _WX_HELPXLP_H_BASE_
-#define __HELPXLPH_BASE__
+#define _WX_HELPXLP_H_BASE_
 
 #include "wx/generic/helpxlp.h"
 
 #endif
-    // __HELPXLPH_BASE__
+    // _WX_HELPXLP_H_BASE_

include/wx/icon.h

@@ -1,15 +1,19 @@
-#ifndef __ICONH_BASE__
+#ifndef _WX_ICON_H_BASE_
-#define __ICONH_BASE__
+#define _WX_ICON_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/icon.h"
+#include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/icon.h"
 #elif defined(__WXQT__)
 #include "wx/qt/icon.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/icon.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/icon.h"
 #endif
 
 #endif
-    // __ICONH_BASE__
+    // _WX_ICON_H_BASE_

include/wx/imaglist.h

@@ -1,5 +1,5 @@
-#ifndef __IMAGLISTH_BASE__
+#ifndef _WX_IMAGLIST_H_BASE_
-#define __IMAGLISTH_BASE__
+#define _WX_IMAGLIST_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/imaglist.h"
@@ -9,7 +9,11 @@
 #include "wx/generic/imaglist.h"
 #elif defined(__WXQT__)
 #include "wx/generic/imaglist.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/imaglist.h"
 #endif
 
 #endif
-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_

include/wx/intl.h

@@ -125,4 +125,4 @@ inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
 }
 
 #endif
-	// __INTLH__
+	// _WX_INTLH__

include/wx/ipcbase.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __IPCBASEH__
+#ifndef _WX_IPCBASEH__
-#define __IPCBASEH__
+#define _WX_IPCBASEH__
 
 #ifdef __GNUG__
 #pragma interface "ipcbase.h"
@@ -94,4 +94,4 @@ class WXDLLEXPORT wxClientBase: public wxObject
 };
 
 #endif
-    // __IPCBASEH__
+    // _WX_IPCBASEH__

include/wx/joystick.h

@@ -1,12 +1,17 @@
-#ifndef __JOYSTICKH_BASE__
+#ifndef _WX_JOYSTICK_H_BASE_
-#define __JOYSTICKH_BASE__
+#define _WX_JOYSTICK_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
+#include "wx/motif/joystick.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/joystick.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/joystick.h"
 #endif
 
 #endif
-    // __JOYSTICKH_BASE__
+    // _WX_JOYSTICK_H_BASE_

include/wx/layout.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LAYOUTH__
+#ifndef _WX_LAYOUTH__
-#define __LAYOUTH__
+#define _WX_LAYOUTH__
 
 #ifdef __GNUG__
 #pragma interface "layout.h"
@@ -306,4 +306,4 @@ class WXDLLEXPORT wxSpacingSizer: public wxSizer
 };
 
 #endif
-    // __LAYOUTH__
+    // _WX_LAYOUTH__

include/wx/list.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __LISTH__
+#ifndef _WX_LISTH__
-#define __LISTH__
+#define _WX_LISTH__
 
 #ifdef __GNUG__
 #pragma interface "list.h"
@@ -140,4 +140,4 @@ class WXDLLEXPORT wxStringList: public wxList
 };
 
 #endif
-    // __LISTH__
+    // _WX_LISTH__

include/wx/listbox.h

@@ -1,15 +1,19 @@
-#ifndef __LISTBOXH_BASE__
+#ifndef _WX_LISTBOX_H_BASE_
-#define __LISTBOXH_BASE__
+#define _WX_LISTBOX_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/listbox.h"
+#include "wx/motif/listbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/listbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/listbox.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/listbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/listbox.h"
 #endif
 
 #endif
-    // __LISTBOXH_BASE__
+    // _WX_LISTBOX_H_BASE_

include/wx/listctrl.h

@@ -1,5 +1,5 @@
-#ifndef __LISTCTRLH_BASE__
+#ifndef _WX_LISTCTRL_H_BASE_
-#define __LISTCTRLH_BASE__
+#define _WX_LISTCTRL_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/listctrl.h"
@@ -9,7 +9,11 @@
 #include "wx/generic/listctrl.h"
 #elif defined(__WXQT__)
 #include "wx/generic/listctrl.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/listctrl.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/listctrl.h"
 #endif
 
 #endif
-    // __LISTCTRLH_BASE__
+    // _WX_LISTCTRL_H_BASE_

include/wx/log.h

@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __LOGH__
+#ifndef   _WX_LOG_H_
-#define   __LOGH__
+#define   _WX_LOG_H_
 
 #ifdef    __GNUG__
 #pragma interface "log.h"
@@ -159,6 +159,7 @@ private:
 };
 
 // log everything to an "ostream", cerr by default
+class ostream;
 class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:
@@ -376,4 +377,4 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
   inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
-#endif  //__LOGH__
+#endif  // _WX_LOG_H_

include/wx/matrix.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MATRIXH__
+#ifndef _WX_MATRIXH__
-#define __MATRIXH__
+#define _WX_MATRIXH__
 
 #ifdef __GNUG__
 #pragma interface "matrix.h"
@@ -141,4 +141,4 @@ inline double wxCalculateDet(double a11, double a21, double a12, double a22)
 }
 
 #endif
-	// __MATRIXH__
+	// _WX_MATRIXH__

include/wx/mdi.h

@@ -1,15 +1,19 @@
-#ifndef __MDIH_BASE__
+#ifndef _WX_MDI_H_BASE_
-#define __MDIH_BASE__
+#define _WX_MDI_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/mdi.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/mdi.h"
+#include "wx/motif/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
 #elif defined(__WXQT__)
 #include "wx/qt/mdi.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/mdi.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/mdi.h"
 #endif
 
 #endif
-    // __MDIH_BASE__
+    // _WX_MDI_H_BASE_

include/wx/memory.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MEMORYH__
+#ifndef _WX_MEMORYH__
-#define __MEMORYH__
+#define _WX_MEMORYH__
 
 #ifdef __GNUG__
 #pragma interface "memory.h"
@@ -275,5 +275,5 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #endif // WXDEBUG
 
 #endif
-    // __MEMORYH__
+    // _WX_MEMORYH__
 

include/wx/menu.h

@@ -1,15 +1,19 @@
-#ifndef __MENUH_BASE__
+#ifndef _WX_MENU_H_BASE_
-#define __MENUH_BASE__
+#define _WX_MENU_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/menu.h"
+#include "wx/motif/menu.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
 #elif defined(__WXQT__)
 #include "wx/qt/menu.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/menu.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/menu.h"
 #endif
 
 #endif
-    // __MENUH_BASE__
+    // _WX_MENU_H_BASE_

include/wx/metafile.h

@@ -1,9 +1,9 @@
-#ifndef __METAFILEH_BASE__
+#ifndef _WX_METAFILE_H_BASE_
-#define __METAFILEH_BASE__
+#define _WX_METAFILE_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/metafile.h"
 #endif
 
 #endif
-    // __METAFILEH_BASE__
+    // _WX_METAFILE_H_BASE_

include/wx/minifram.h

@@ -1,13 +1,17 @@
-#ifndef __MINIFRAMH_BASE__
+#ifndef _WX_MINIFRAM_H_BASE_
-#define __MINIFRAMH_BASE_
+#define _WX_MINIFRAMH_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/minifram.h"
+#include "wx/motif/minifram.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/minifram.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/minifram.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/minifram.h"
 #endif
 
 #endif
-    // __MINIFRAMH_BASE__
+    // _WX_MINIFRAM_H_BASE_

include/wx/module.h

@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __MODULEH__
+#ifndef _WX_MODULEH__
-#define __MODULEH__
+#define _WX_MODULEH__
 
 #ifdef __GNUG__
 #pragma interface "module.h"

include/wx/msgdlg.h

@@ -1,5 +1,5 @@
-#ifndef __MSGDLGH_BASE__
+#ifndef _WX_MSGDLG_H_BASE_
-#define __MSGDLGH_BASE__
+#define _WX_MSGDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"
@@ -9,7 +9,11 @@
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/msgdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/msgdlgg.h"
 #endif
 
 #endif
-    // __MSGDLGH_BASE__
+    // _WX_MSGDLG_H_BASE_

include/wx/mstream.h

@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXMMSTREAM_H__
+#ifndef _WX_WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__
 
 #include <wx/stream.h>
 

include/wx/msw/dc.h

@@ -57,10 +57,10 @@ public:
     CrossHair(pt.x, pt.y);
   }
 
-  virtual void DrawArc(long x1,long y1,long x2,long y2,double xc, double yc);
+  virtual void DrawArc(long x1,long y1,long x2,long y2,long xc, long yc);
-  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, double xc, double yc)
+  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)
   {
-    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, xc, yc);
+    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);
   }
 
   virtual void DrawEllipticArc (long x, long y, long w, long h, double sa, double ea);

include/wx/notebook.h

@@ -1,15 +1,19 @@
-#ifndef __NOTEBOOKH_BASE__
+#ifndef _WX_NOTEBOOK_H_BASE_
-#define __NOTEBOOKH_BASE__
+#define _WX_NOTEBOOK_H_BASE_
 
 #if defined(__WXMSW__)
   #include  "wx/msw/notebook.h"
 #elif defined(__WXMOTIF__)
-  #error "wxNotebook not implemented under Motif"
+  #include  "wx/motif/notebook.h"
 #elif defined(__WXGTK__)
   #include  "wx/gtk/notebook.h"
 #elif defined(__WXQT__)
   #include  "wx/qt/notebook.h"
+#elif defined(__WXMAC__)
+  #include  "wx/mac/notebook.h"
+#elif defined(__WXSTUBS__)
+  #include  "wx/stubs/notebook.h"
 #endif
 
 #endif
-    // __NOTEBOOKH_BASE__
+    // _WX_NOTEBOOK_H_BASE_

include/wx/object.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __OBJECTH__
+#ifndef _WX_OBJECTH__
-#define __OBJECTH__
+#define _WX_OBJECTH__
 
 #ifdef __GNUG__
 #pragma interface "object.h"
@@ -221,6 +221,6 @@ private:
 #endif
 
 #endif
-    // __OBJECTH__
+    // _WX_OBJECTH__
 
 

include/wx/objstrm.h

@@ -8,8 +8,8 @@
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WXOBJSTRM_H__
+#ifndef _WX_WXOBJSTRM_H__
-#define __WXOBJSTRM_H__
+#define _WX_WXOBJSTRM_H__
 
 #ifdef __GNUG__
 #pragma interface

include/wx/odbc.h

@@ -17,8 +17,8 @@
 #pragma interface "odbc.h"
 #endif
 
-#ifndef __ODBCH__
+#ifndef _WX_ODBCH__
-#define __ODBCH__
+#define _WX_ODBCH__
 
 #ifdef __WXMSW__
 #include <windows.h>

include/wx/palette.h

@@ -1,15 +1,19 @@
-#ifndef __PALETTEH_BASE__
+#ifndef _WX_PALETTE_H_BASE_
-#define __PALETTEH_BASE__
+#define _WX_PALETTE_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/palette.h"
+#include "wx/motif/palette.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/palette.h"
 #elif defined(__WXQT__)
 #include "wx/qt/palette.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/palette.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/palette.h"
 #endif
 
 #endif
-    // __PALETTEH_BASE__
+    // _WX_PALETTE_H_BASE_

include/wx/panel.h

@@ -1,7 +1,7 @@
-#ifndef __PANELH_BASE__
+#ifndef _WX_PANEL_H_BASE_
-#define __PANELH_BASE__
+#define _WX_PANEL_H_BASE_
 
 #include "wx/generic/panelg.h"
 
 #endif
-    // __PANELH_BASE_
+    // _WX_PANELH_BASE_

include/wx/pen.h

@@ -1,15 +1,19 @@
-#ifndef __PENH_BASE__
+#ifndef _WX_PEN_H_BASE_
-#define __PENH_BASE__
+#define _WX_PEN_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/pen.h"
+#include "wx/motif/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/pen.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/pen.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/pen.h"
 #endif
 
 #endif
-    // __PENH_BASE__
+    // _WX_PEN_H_BASE_

include/wx/pnghand.h

@@ -1,13 +1,17 @@
-#ifndef __PNGHANDH_BASE__
+#ifndef _WX_PNGHAND_H_BASE_
-#define __PNGHANDH_BASE__
+#define _WX_PNGHAND_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/pnghand.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/pnghand.h"
+#include "wx/motif/pnghand.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pnghand.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/pnghand.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/pnghand.h"
 #endif
 
 #endif
-    // __PNGHANDH_BASE__
+    // _WX_PNGHAND_H_BASE_

include/wx/postscrp.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __POSTSCRPH__
+#ifndef _WX_POSTSCRPH__
-#define __POSTSCRPH__
+#define _WX_POSTSCRPH__
 
 #ifdef __GNUG__
 #pragma interface "postscrp.h"
@@ -295,4 +295,4 @@ WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 #endif // USE_POSTSCRIPT
 #endif
-        // __POSTSCRPH__
+        // _WX_POSTSCRPH__

include/wx/print.h

@@ -1,5 +1,5 @@
-#ifndef __PRINTH_BASE__
+#ifndef _WX_PRINT_H_BASE_
-#define __PRINTH_BASE__
+#define _WX_PRINT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/printwin.h"
@@ -25,4 +25,4 @@
 
 
 #endif
-    // __PRINTH_BASE__
+    // _WX_PRINT_H_BASE_

include/wx/printdlg.h

@@ -1,5 +1,5 @@
-#ifndef __PRINTDLGH_BASE__
+#ifndef _WX_PRINTDLG_H_BASE_
-#define __PRINTDLGH_BASE__
+#define _WX_PRINTDLG_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/printdlg.h"
@@ -7,7 +7,13 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
+#elif defined(__WXQT__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXSRUBS__)
+#include "wx/generic/prntdlgg.h"
 #endif
 
 #endif
-    // __PRINTDLGH_BASE__
+    // _WX_PRINTDLG_H_BASE_

include/wx/prntbase.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PRNTBASEH__
+#ifndef _WX_PRNTBASEH__
-#define __PRNTBASEH__
+#define _WX_PRNTBASEH__
 
 #ifdef __GNUG__
 #pragma interface "prntbase.h"
@@ -22,6 +22,7 @@
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
+#include "wx/frame.h"
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxButton;
@@ -332,4 +333,4 @@ public:
 };
 
 #endif
-    // __PRNTBASEH__
+    // _WX_PRNTBASEH__

include/wx/process.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __PROCESSH__
+#ifndef _WX_PROCESSH__
-#define __PROCESSH__
+#define _WX_PROCESSH__
 
 #ifdef __GNUG__
 #pragma interface "process.h"
@@ -55,4 +55,4 @@ typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 #define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL},
 
 #endif
-    // __PROCESSH__
+    // _WX_PROCESSH__

include/wx/radiobox.h

@@ -1,15 +1,19 @@
-#ifndef __RADIOBOXH_BASE__
+#ifndef _WX_RADIOBOX_H_BASE_
-#define __RADIOBOXH_BASE__
+#define _WX_RADIOBOX_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/radiobox.h"
+#include "wx/motif/radiobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobox.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/radiobox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/radiobox.h"
 #endif
 
 #endif
-    // __RADIOBOXH_BASE__
+    // _WX_RADIOBOX_H_BASE_

include/wx/radiobut.h

@@ -1,15 +1,19 @@
-#ifndef __RADIOBUTH_BASE__
+#ifndef _WX_RADIOBUT_H_BASE_
-#define __RADIOBUTH_BASE__
+#define _WX_RADIOBUT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/radiobut.h"
+#include "wx/motif/radiobut.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobut.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobut.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/radiobut.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/radiobut.h"
 #endif
 
 #endif
-    // __RADIOBUTH_BASE__
+    // _WX_RADIOBUT_H_BASE_

include/wx/region.h

@@ -1,15 +1,19 @@
-#ifndef __REGIONH_BASE__
+#ifndef _WX_REGION_H_BASE_
-#define __REGIONH_BASE__
+#define _WX_REGION_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/region.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/region.h"
+#include "wx/motif/region.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/region.h"
 #elif defined(__WXQT__)
 #include "wx/qt/region.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/region.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/region.h"
 #endif
 
 #endif
-    // __REGIONH_BASE__
+    // _WX_REGION_H_BASE_

include/wx/resource.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __RESOURCEH__
+#ifndef _WX_RESOURCEH__
-#define __RESOURCEH__
+#define _WX_RESOURCEH__
 
 #ifdef __GNUG__
 #pragma interface "resource.h"
@@ -171,4 +171,4 @@ extern int WXDLLEXPORT wxResourceGetIdentifier(char *name, wxResourceTable *tabl
 
 #endif
 #endif
-    // __RESOURCEH__
+    // _WX_RESOURCEH__

include/wx/scrolbar.h

@@ -1,15 +1,19 @@
-#ifndef __SCROLBARH_BASE__
+#ifndef _WX_SCROLBAR_H_BASE_
-#define __SCROLBARH_BASE__
+#define _WX_SCROLBAR_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/scrolbar.h"
+#include "wx/motif/scrolbar.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/scrolbar.h"
 #elif defined(__WXQT__)
 #include "wx/qt/scrolbar.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/scrolbar.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/scrolbar.h"
 #endif
 
 #endif
-    // __SCROLBARH_BASE__
+    // _WX_SCROLBAR_H_BASE_

include/wx/scrolwin.h

@@ -1,7 +1,7 @@
-#ifndef __SCROLWINH_BASE__
+#ifndef _WX_SCROLWIN_H_BASE_
-#define __SCROLWINH_BASE__
+#define _WX_SCROLWIN_H_BASE_
 
 #include "wx/generic/scrolwin.h"
 
 #endif
-    // __SCROLWINH_BASE__
+    // _WX_SCROLWIN_H_BASE_

include/wx/serbase.h

@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
-#ifndef __WX_SERBASEH_H__
+#ifndef _WX_WX_SERBASEH_H__
-#define __WX_SERBASEH_H__
+#define _WX_WX_SERBASEH_H__
 
 #include <wx/dynlib.h>
 

include/wx/settings.h

@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __SETTINGSH_BASE__
+#ifndef _WX_SETTINGS_H_BASE_
-#define __SETTINGSH_BASE__
+#define _WX_SETTINGS_H_BASE_
 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1
@@ -107,13 +107,17 @@
 #if defined(__WXMSW__)
 #include "wx/msw/settings.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/settings.h"
+#include "wx/motif/settings.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"
 #elif defined(__WXQT__)
 #include "wx/qt/settings.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/settings.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/settings.h"
 #endif
 
 #endif
-    // __SETTINGSH_BASE__
+    // _WX_SETTINGS_H_BASE_
 

include/wx/setup.h

@@ -1,22 +1,26 @@
 
-#ifndef __SETUPH_BASE__
+#ifndef _WX_SETUP_H_BASE_
-#define __SETUPH_BASE__
+#define _WX_SETUP_H_BASE_
 
 // compatibility code, to be removed asap:
 
-#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__)
+#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__)
-#  if defined(__WINDOWS__)
+#    error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__
-#    define __WXMSW__
-#  else
-#    error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
-#  endif
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/setup.h"
-#else
+#elif defined(__WXMAC__)
+#include "wx/mac/setup.h"
+#elif defined(__WXQT__)
+#include "wx/qt/setup.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/setup.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/setup.h"
+#elif defined(__WXGTK__)
 #include "wx/../../install/unix/setup/setup.h"
 #endif
 
 #endif
-	// __SETUPH_BASE__
+	// _WX_SETUP_H_BASE_

include/wx/slider.h

@@ -1,15 +1,19 @@
-#ifndef __SLIDERH_BASE__
+#ifndef _WX_SLIDER_H_BASE_
-#define __SLIDERH_BASE__
+#define _WX_SLIDER_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/slider.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/slider.h"
+#include "wx/motif/slider.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/slider.h"
 #elif defined(__WXQT__)
 #include "wx/qt/slider.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/slider.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/slider.h"
 #endif
 
 #endif
-    // __SLIDERH_BASE__
+    // _WX_SLIDER_H_BASE_

include/wx/spinbutt.h

@@ -1,15 +1,19 @@
-#ifndef __SPINBUTTH_BASE__
+#ifndef _WX_SPINBUTT_H_BASE_
-#define __SPINBUTTH_BASE__
+#define _WX_SPINBUTT_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/spinbutt.h"
+#include "wx/motif/spinbutt.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/spinbutt.h"
 #elif defined(__WXQT__)
 #include "wx/qt/spinbutt.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/spinbutt.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/spinbutt.h"
 #endif
 
 #endif
-    // __SPINBUTTH_BASE__
+    // _WX_SPINBUTT_H_BASE_

include/wx/splitter.h

@@ -1,7 +1,7 @@
-#ifndef __SPLITTERH_BASE__
+#ifndef _WX_SPLITTER_H_BASE_
-#define __SPLITTERH_BASE__
+#define _WX_SPLITTER_H_BASE_
 
 #include "wx/generic/splitter.h"
 
 #endif
-    // __SPLITTERH_BASE__
+    // _WX_SPLITTER_H_BASE_

include/wx/statbmp.h

@@ -1,15 +1,19 @@
-#ifndef __STATBMPH_BASE__
+#ifndef _WX_STATBMP_H_BASE_
-#define __STATBMPH_BASE__
+#define _WX_STATBMP_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/statbmp.h"
+#include "wx/motif/statbmp.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbmp.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbmp.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/statbmp.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/statbmp.h"
 #endif
 
 #endif
-    // __STATBMPH_BASE__
+    // _WX_STATBMP_H_BASE_

include/wx/statbox.h

@@ -1,15 +1,19 @@
-#ifndef __STATBOXH_BASE__
+#ifndef _WX_STATBOX_H_BASE_
-#define __STATBOXH_BASE__
+#define _WX_STATBOX_H_BASE_
 
 #if defined(__WXMSW__)
 #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
-#include "wx/xt/statbox.h"
+#include "wx/motif/statbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbox.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/statbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/statbox.h"
 #endif
 
 #endif
-    // __STATBOXH_BASE__
+    // _WX_STATBOX_H_BASE_