Header changes (gtk.h etc no longer included in defs.h

but in *.cpp to speed up compilation (?) )


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

include/wx/defs.h

@@ -16,15 +16,6 @@
 #pragma interface "defs.h"
 #endif
 
-#ifdef __WXGTK__
-
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
-
-#endif
-
 #include <stddef.h>
 
 #include "wx/setup.h"
@@ -664,7 +655,8 @@ enum {
 
 
 // Logical ops
-typedef enum {
+typedef enum 
+{
   wxCLEAR,      // 0
   wxXOR,        // src XOR dst
   wxINVERT,     // NOT dst
@@ -736,8 +728,8 @@ typedef enum {
 #define wxSIZE_NO_ADJUSTMENTS   0x0008
 
 
-// Data format for drag & drop and clipboard operations
+/* Data format for drag & drop and clipboard operations
-// numbers as per winuser.h
+ * numbers as per winuser.h */
 
 enum wxDataFormat
 {
@@ -750,9 +742,10 @@ enum wxDataFormat
   wxDF_PRIVATE =          20
 };
 
-// Virtual keycodes
+/* Virtual keycodes */
 
-enum wxKeyCode {
+enum wxKeyCode 
+{
  WXK_BACK    =   8,
  WXK_TAB     =   9,
  WXK_RETURN  =	13,
@@ -771,8 +764,8 @@ enum wxKeyCode {
  WXK_MENU,
  WXK_PAUSE,
  WXK_CAPITAL,
- WXK_PRIOR,  // Page up
+ WXK_PRIOR,  /* Page up */
- WXK_NEXT,   // Page down
+ WXK_NEXT,   /* Page down */
  WXK_END,
  WXK_HOME,
  WXK_LEFT,
@@ -831,37 +824,36 @@ enum wxKeyCode {
  WXK_PAGEDOWN
 };
 
-// Colours - see wx_gdi.cc for database
+/* OS mnemonics -- Identify the running OS (useful for Windows)
-
+ * [Not all platforms are currently available or supported] */
-// OS mnemonics -- Identify the running OS (useful for Windows)
+enum 
-// [Not all platforms are currently available or supported]
+{
-enum {
   wxUNKNOWN_PLATFORM,
-  wxCURSES,     // Text-only CURSES
+  wxCURSES,     /* Text-only CURSES */
-  wxXVIEW_X,	// Sun's XView OpenLOOK toolkit
+  wxXVIEW_X,	/* Sun's XView OpenLOOK toolkit */
-  wxMOTIF_X,	// OSF Motif 1.x.x
+  wxMOTIF_X,	/* OSF Motif 1.x.x */
-  wxCOSE_X,	    // OSF Common Desktop Environment
+  wxCOSE_X,	/* OSF Common Desktop Environment */
-  wxNEXTSTEP,	// NeXTStep
+  wxNEXTSTEP,	/* NeXTStep */
-  wxMACINTOSH,	// Apple System 7
+  wxMACINTOSH,	/* Apple System 7 */
-  wxGTK,	    // GTK
+  wxGTK,	/* GTK */
-  wxQT,	        // Qt
+  wxQT,	        /* Qt */
-  wxGEOS,	    // GEOS
+  wxGEOS,	/* GEOS */
-  wxOS2_PM,	    // OS/2 Workplace
+  wxOS2_PM,	/* OS/2 Workplace */
-  wxWINDOWS,	// Windows or WfW
+  wxWINDOWS,	/* Windows or WfW */
-  wxPENWINDOWS,	// Windows for Pen Computing
+  wxPENWINDOWS,	/* Windows for Pen Computing */
-  wxWINDOWS_NT,	// Windows NT
+  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
+/* Printing */
 #ifndef wxPORTRAIT
 #define wxPORTRAIT      1
 #define wxLANDSCAPE     2
 #endif
 
-// Standard menu identifiers
+/* Standard menu identifiers */
 #define wxID_OPEN               5000
 #define wxID_CLOSE              5001
 #define wxID_NEW                5002
@@ -908,13 +900,12 @@ enum {
 
 #define wxID_HIGHEST            5999
 
-// Shortcut for easier dialog-unit-to-pixel conversion
+/* Shortcut for easier dialog-unit-to-pixel conversion */
 #define wxDLG_UNIT(parent, pt) parent->ConvertDialogToPixels(pt)
 
 #ifdef __WXMSW__
-// Stand-ins for Windows types, to avoid
+/* Stand-ins for Windows types, to avoid
-// #including all of windows.h
+ * #including all of windows.h */
-
 typedef unsigned long   WXHWND;
 typedef unsigned long   WXHANDLE;
 typedef unsigned long   WXHICON;
@@ -956,7 +947,7 @@ typedef int (*WXFARPROC)();
 #endif
 
 #ifdef __WXMOTIF__
-// Stand-ins for X/Xt/Motif types
+/* Stand-ins for X/Xt/Motif types */
 typedef void*           WXWindow;
 typedef void*           WXWidget;
 typedef void*           WXAppContext;
@@ -974,5 +965,36 @@ typedef void*           WXCursor;
 typedef void*           WXFontList;
 #endif
 
+#ifdef __WXGTK__
+/* Stand-ins for GLIB types */
+typedef int            gint;
+typedef unsigned       guint;
+typedef unsigned long  gulong;
+typedef void*          gpointer;
+
+/* Stand-ins for GDK types */
+typedef gulong                  GdkAtom;
+typedef struct _GdkColor        GdkColor;
+typedef struct _GdkColormap     GdkColormap;
+typedef struct _GdkFont         GdkFont;
+typedef struct _GdkGC           GdkGC;
+typedef struct _GdkWindow       GdkWindow;
+typedef struct _GdkWindow       GdkBitmap;
+typedef struct _GdkWindow       GdkPixmap;
+typedef struct _GdkCursor       GdkCursor;
+typedef struct _GdkRegion       GdkRegion;
+
+/* Stand-ins for GTK types */
+typedef struct _GtkWidget       GtkWidget;
+typedef struct _GtkStyle        GtkStyle;
+typedef struct _GtkAdjustment   GtkAdjustment;
+typedef struct _GtkList         GtkList;
+typedef struct _GtkToolbar      GtkToolbar;
+typedef struct _GtkNotebook     GtkNotebook;
+typedef struct _GtkNotebookPage GtkNotebookPage;
+
+#endif
+
+
 #endif
     // _WX_DEFS_H_

include/wx/gtk/tbargtk.h

@@ -143,8 +143,8 @@ class wxToolBar: public wxControl
     int           m_separation;
     wxList        m_tools;
     
-    GdkColor      m_fg;
+    GdkColor      *m_fg;
-    GdkColor      m_bg;
+    GdkColor      *m_bg;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

include/wx/gtk1/tbargtk.h

@@ -143,8 +143,8 @@ class wxToolBar: public wxControl
     int           m_separation;
     wxList        m_tools;
     
-    GdkColor      m_fg;
+    GdkColor      *m_fg;
-    GdkColor      m_bg;
+    GdkColor      *m_bg;
     int           m_xMargin;
     int           m_yMargin;
     bool          m_hasToolAlready;

setup/maketmpl.in

@@ -96,12 +96,11 @@ EXTRA_LINK = @EXTRA_LINK@
 # INCLUDES
 WX_INCLUDES = \
 $(TOOLKIT_DEF) \
--I. \
--I.. \
 -I$(WXBASEDIR)/include \
+-I. \
+$(GUI_TK_INCLUDE) \
 -I$(WXBASEDIR)/src/zlib \
 -I$(WXBASEDIR)/src/iodbc \
-$(GUI_TK_INCLUDE) \
 $(OPENGL_INCLUDE) \
 $(X_CFLAGS)
 

src/common/image.cpp

@@ -25,11 +25,6 @@
 #include "../png/png.h"
 #include "wx/filefn.h"
 
-#ifdef __WXGTK__
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxImage
 //-----------------------------------------------------------------------------
@@ -1247,6 +1242,10 @@ wxImage::wxImage( const wxBitmap &bitmap )
 
 #ifdef __WXGTK__
 
+#include "gtk/gtk.h"
+#include "gdk/gdk.h"
+#include "gdk/gdkx.h"
+
 wxBitmap wxImage::ConvertToBitmap() const
 {
     wxBitmap bitmap;

src/gtk/app.cpp

@@ -26,6 +26,11 @@
 
 #include "unistd.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------

src/gtk/bitmap.cpp

@@ -14,9 +14,11 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
+#include "wx/image.h"
+
+#include "gdk/gdk.h"
 #include "gdk/gdkprivate.h"
 #include "gdk/gdkx.h"
-#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // wxMask

src/gtk/bmpbuttn.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/bmpbuttn.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

src/gtk/brush.cpp

@@ -13,6 +13,8 @@
 
 #include "wx/brush.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------

src/gtk/button.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/button.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

src/gtk/checkbox.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/checkbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/checklst.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/checklst.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 //-----------------------------------------------------------------------------

src/gtk/choice.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/choice.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/clipbrd.cpp

@@ -13,6 +13,10 @@
 
 #include "wx/clipbrd.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/colour.cpp

@@ -14,6 +14,7 @@
 
 #include "wx/gdicmn.h"
 
+#include "gdk/gdk.h"
 #include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------

src/gtk/combobox.cpp

@@ -14,6 +14,9 @@
 #include "wx/combobox.h"
 #include <wx/intl.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/cursor.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/cursor.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------

src/gtk/data.cpp

@@ -21,8 +21,7 @@
 
 #define _MAXPATHLEN 500
 
-// Used for X resources
+/* Used for X resources */
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
@@ -30,50 +29,49 @@
 wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
 XrmDatabase wxResourceDatabase;
 
-// Useful buffer, initialized in wxCommonInit
+/* Useful buffer, initialized in wxCommonInit */
 char *wxBuffer = (char *) NULL;
 
-// Windows List
+/* Windows List */
 wxList wxTopLevelWindows;
 
-// List of windows pending deletion
+/* List of windows pending deletion */
 wxList wxPendingDelete;
 
-// Current cursor, in order to hang on to
+/* Current cursor, in order to hang on to
-// cursor handle when setting the cursor globally
+ * cursor handle when setting the cursor globally */
 wxCursor *g_globalCursor = (wxCursor *) NULL;
 
-// Don't allow event propagation during drag
+/* Don't allow event propagation during drag */
 bool g_blockEventsOnDrag = FALSE;
 
-// Don't allow mouse event propagation during scroll
+/* Don't allow mouse event propagation during scroll */
 bool g_blockEventsOnScroll = FALSE;
 
-// Message Strings for Internationalization
+/* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
-// Custom OS version, as optionally placed in wx.ini/.wxrc
+/* Custom OS version, as optionally placed in wx.ini/.wxrc
-// Currently this can be Win95, Windows, Win32s, WinNT.
+ * Currently this can be Win95, Windows, Win32s, WinNT.
-// For some systems, you can't tell until run-time what services you
+ * For some systems, you can't tell until run-time what services you
-// have. See wxGetOsVersion, which uses this string if present.
+ * have. See wxGetOsVersion, which uses this string if present. */
 char *wxOsVersion = (char *) NULL;
 
-// For printing several pages
+/* For printing several pages */
 int wxPageNumber;
 wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL;
 
-// GDI Object Lists
+/* GDI Object Lists */
 wxBrushList      *wxTheBrushList = (wxBrushList *) NULL;
 wxPenList        *wxThePenList = (wxPenList *) NULL;
 wxFontList       *wxTheFontList = (wxFontList *) NULL;
 wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
 wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;
   
-
+/* X only font names */
-// X only font names
 wxFontNameDirectory *wxTheFontNameDirectory;
 
-// Stock objects
+/* Stock objects */
 wxFont *wxNORMAL_FONT;
 wxFont *wxSMALL_FONT;
 wxFont *wxITALIC_FONT;
@@ -103,7 +101,7 @@ wxBrush *wxLIGHT_GREY_BRUSH;
 
 wxColour *wxBLACK;
 wxColour *wxWHITE;
-wxColour *wxGREY;            // Robert Roebling
+wxColour *wxGREY; 
 wxColour *wxRED;
 wxColour *wxBLUE;
 wxColour *wxGREEN;
@@ -114,7 +112,7 @@ wxCursor *wxSTANDARD_CURSOR = (wxCursor *) NULL;
 wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
-// 'Null' objects
+/* 'Null' objects */
 wxAcceleratorTable   wxNullAcceleratorTable;
 wxBitmap   wxNullBitmap;
 wxIcon     wxNullIcon;  
@@ -126,7 +124,7 @@ wxColour   wxNullColour;
 wxPalette  wxNullPalette; 
 wxRegion   wxNullRegion; 
 
-// Default window names
+/* Default window names */
 const char *wxButtonNameStr = "button";
 const char *wxCanvasNameStr = "canvas";
 const char *wxCheckBoxNameStr = "check";
@@ -162,610 +160,10 @@ const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 
-// See wx/utils.h
+/* See wx/utils.h */
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";
 
-#ifdef wx_msw
+/* Dafaults for wxWindow etc. */
-const char *wxUserResourceStr = "TEXT";
-#endif
-
-
-#if wxUSE_SHARED_LIBRARY
-/*
- * For wxWindows to be made into a dynamic library (e.g. Sun),
- * all IMPLEMENT_... macros must be in one place.
- * But normally, the definitions are in the appropriate places.
- */
-
-// Hand-coded IMPLEMENT... macro for wxObject (define static data)
-wxClassInfo wxObject::classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
-wxClassInfo *wxClassInfo::first = (wxClassInfo *) NULL;
-wxHashTable wxClassInfo::classTable(wxKEY_STRING);
-
-#include "wx/button.h"
-#include "wx/bmpbuttn.h"
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
-#include "wx/checkbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-
-#include "wx/choice.h"
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-
-#if wxUSE_CLIPBOARD
-#include "wx/clipbrd.h"
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
-#endif
-
-#if wxUSE_COMBOBOX
-#include "wx/combobox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
-
-#include "wx/dc.h"
-#include "wx/dcmemory.h"
-#include "wx/dcclient.h"
-#include "wx/dcscreen.h"
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-
-#if defined(wx_msw)
-#include "wx/dcprint.h"
-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
-
-#include "wx/dialog.h"
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxWindow)
-
-#include "wx/frame.h"
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
-#include "wx/mdi.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
-
-#include "wx/cmndata.h"
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-
-#include "wx/colordlg.h"
-#include "wx/fontdlg.h"
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-#include "wx/generic/colordlg.h"
-#include "wx/generic/fontdlg.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
-#endif
-
-// X defines wxColourDialog to be wxGenericColourDialog
-#ifndef wx_x
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/palette.h"
-#include "wx/icon.h"
-#include "wx/cursor.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-IMPLEMENT_CLASS(wxColourDatabase, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-
-/*
-#if (!USE_TYPEDEFS)
-IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIntPoint, wxObject)
-#endif
-*/
-
-#if defined(wx_x) || (defined(wx_msw) && wxUSE_PORTABLE_FONTS_IN_MSW)
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-#endif
-
-#include "wx/hash.h"
-IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
-
-#include "wx/help.h"
-IMPLEMENT_DYNAMIC_CLASS(wxHelpInstance, wxClient)
-IMPLEMENT_CLASS(wxHelpConnection, wxConnection)
-
-#include "wx/list.h"
-IMPLEMENT_DYNAMIC_CLASS(wxNode, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxList)
-
-#if wxUSE_PRINTING_ARCHITECTURE
-#include "wx/print.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxPrinterBase, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
-IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
-IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
-IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
-IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
-IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
-IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
-#endif
-
-#if wxUSE_POSTSCRIPT
-#include "wx/postscrp.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
-#endif
-
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
-IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
-#endif
-
-#include "wx/event.h"
-IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
-
-#include "wx/utils.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
-
-// IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
-
-#include "wx/process.h"
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-
-#if wxUSE_TIMEDATE
-#include "wx/date.h"
-IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#include "wx/docview.h"
-//IMPLEMENT_ABSTRACT_CLASS(wxDocItem, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-#if wxUSE_PRINTING_ARCHITECTURE
-IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-#endif
-IMPLEMENT_CLASS(wxCommand, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-#endif
-
-#if wxUSE_CONSTRAINTS
-#include "wx/layout.h"
-IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSizer, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRowColSizer, wxSizer)
-#endif
-
-#if wxUSE_TOOLBAR
-#include "wx/tbarbase.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
-
-#include "wx/tbarsmpl.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
-
-#ifdef wx_msw
-#include "wx/tbarmsw.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
-
-#include "wx/tbar95.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
-#endif
-
-#endif
-
-#include "wx/sckaddr.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
-#ifdef ENABLE_IPV6
-IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
-#endif
-#ifndef __UNIX__
-IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
-#endif
-
-#include "wx/socket.h"
-
-IMPLEMENT_CLASS(wxSocketBase, wxEvtHandler)
-IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-
-#include "wx/url.h"
-
-IMPLEMENT_CLASS(wxProtoInfo, wxObject)
-IMPLEMENT_CLASS(wxURL, wxObject)
-
-#include "wx/protocol/http.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
-
-#include "wx/protocol/ftp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFTP, "ftp", "21", TRUE)
-
-#include "wx/protocol/sckfile.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
-
-#include "wx/sckipc.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
-
-#include "wx/statusbr.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
-
-BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
-  EVT_PAINT(wxStatusBar::OnPaint)
-    EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
-END_EVENT_TABLE()
-
-#if wxUSE_TIMEDATE
-#include "wx/time.h"
-IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-#endif
-
-#if !USE_GNU_WXSTRING
-#include "wx/string.h"
-IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
-#endif
-
-#ifdef wx_motif
-IMPLEMENT_DYNAMIC_CLASS(wxXColormap, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxXFont, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
-#endif
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-
-// This will presumably be implemented on other platforms too
-#ifdef wx_msw
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
-#endif
-
-#include "wx/statbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
-#if wxUSE_IPC
-#include "wx/dde.h"
-IMPLEMENT_ABSTRACT_CLASS(wxDDEObject, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxDDEObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxDDEObject)
-IMPLEMENT_CLASS(wxDDEConnection, wxObject)
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
-
-#include "wx/listbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-
-#include "wx/menu.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-
-#include "wx/stattext.h"
-#include "wx/statbmp.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
-#if wxUSE_METAFILE
-#include "wx/metafile.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
-#endif
-
-#include "wx/radiobox.h"
-#include "wx/radiobut.h"
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
-
-#include "wx/scrolbar.h"
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
-  EVT_SCROLL(wxScrollBar::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-#include "wx/slider.h"
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSlider, wxControl)
-  EVT_SCROLL(wxSlider::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-#include "wx/timer.h"
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-
-#include "wx/textctrl.h"
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-
-#include "wx/window.h"
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-
-#include "wx/scrolwin.h"
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
-
-#include "wx/panel.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
-
-#include "wx/msgbxdlg.h"
-#include "wx/textdlg.h"
-#include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/choicdlg.h"
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-#include "wx/generic/msgdlgg.h"
-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
-
-IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
-IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-
-#ifdef wx_msw
-IMPLEMENT_CLASS(wxMessageDialog)
-#endif
-
-#if wxUSE_GAUGE
-#ifdef wx_motif
-#include "../../contrib/xmgauge/gauge.h"
-#endif
-#include "wx_gauge.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
-
-#include "wx/grid.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGenericGrid, wxPanel)
-
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-  { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, 
-#ifdef __SGI_CC__
-	0L
-#else
-	NULL 
-#endif
-	} 
-};
-
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-  EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-  EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-  EVT_CHAR_HOOK(wxDialog::OnCharHook)
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
-  EVT_SIZE(wxWindow::Size)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
-  EVT_SCROLL(wxScrolledWindow::OnScroll)
-  EVT_SIZE(wxScrolledWindow::OnSize)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPanel, wxWindow)
-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-  EVT_CHAR(wxTextCtrl::OnChar)
-  EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
-  EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
-END_EVENT_TABLE()
-
-#ifdef wx_msw
-BEGIN_EVENT_TABLE(wxMDIParentWindow, wxFrame)
-  EVT_SIZE(wxMDIParentWindow::OnSize)
-  EVT_ACTIVATE(wxMDIParentWindow::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentWindow::OnSysColourChanged)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-  EVT_SCROLL(wxToolBarBase::OnScroll)
-  EVT_SIZE(wxToolBarBase::OnSize)
-  EVT_IDLE(wxToolBarBase::OnIdle)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
-  EVT_SIZE(wxToolBarSimple::OnSize)
-  EVT_PAINT(wxToolBarSimple::OnPaint)
-  EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
-  EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
-END_EVENT_TABLE()
-
-#ifdef wx_msw
-BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
-  EVT_SIZE(wxToolBarMSW::OnSize)
-  EVT_PAINT(wxToolBarMSW::OnPaint)
-  EVT_MOUSE_EVENTS(wxToolBarMSW::OnMouseEvent)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-  EVT_SIZE(wxToolBar95::OnSize)
-  EVT_PAINT(wxToolBar95::OnPaint)
-  EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
-  EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-    EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
-END_EVENT_TABLE()
-#endif
-
-BEGIN_EVENT_TABLE(wxGenericGrid, wxPanel)
-  EVT_SIZE(wxGenericGrid::OnSize)
-  EVT_PAINT(wxGenericGrid::OnPaint)
-  EVT_MOUSE_EVENTS(wxGenericGrid::OnMouseEvent)
-    EVT_TEXT(wxGRID_TEXT_CTRL, wxGenericGrid::OnText)
-    EVT_COMMAND_SCROLL(wxGRID_HSCROLL, wxGenericGrid::OnGridScroll)
-    EVT_COMMAND_SCROLL(wxGRID_VSCROLL, wxGenericGrid::OnGridScroll)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
-  EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
-END_EVENT_TABLE()
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
-  EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
-  EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-  EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
-  EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
-  EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
-  EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
-  EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
-  EVT_PAINT(wxGenericColourDialog::OnPaint)
-  EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
-  EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
-  EVT_PAINT(wxGenericFontDialog::OnPaint)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
-    EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
-    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
-    EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
-END_EVENT_TABLE()
-
-#endif
-
-BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
-  EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
-  EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
-END_EVENT_TABLE()
-
-#include "wx/prntbase.h"
-
-BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
-  EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPreviewControlBar, wxWindow)
-  EVT_BUTTON(wxID_PREVIEW_CLOSE,     wxPreviewControlBar::OnClose)
-  EVT_BUTTON(wxID_PREVIEW_PRINT,     wxPreviewControlBar::OnPrint)
-  EVT_BUTTON(wxID_PREVIEW_PREVIOUS,   wxPreviewControlBar::OnPrevious)
-  EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNext)
-  EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
-END_EVENT_TABLE()
-
-#endif
-
-
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);

src/gtk/dc.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/dc.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

src/gtk/dcclient.cpp

@@ -16,6 +16,9 @@
 #include "wx/image.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // local data
 //-----------------------------------------------------------------------------

src/gtk/dcmemory.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/dcmemory.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------

src/gtk/dcps.cpp

@@ -24,6 +24,9 @@
 #include "wx/image.h"
 #include "wx/log.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // start and end of document/page
 //-----------------------------------------------------------------------------

src/gtk/dcscreen.cpp

@@ -14,6 +14,9 @@
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // global data initialization
 //-----------------------------------------------------------------------------

src/gtk/dialog.cpp

@@ -14,6 +14,9 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk/dnd.cpp

@@ -18,6 +18,8 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 
 #include <X11/Xlib.h>

src/gtk/filedlg.cpp

@@ -16,6 +16,8 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
@@ -29,11 +31,14 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
     style = dialog->GetStyle();
 
     if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
-	if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) {
+    {
+	if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) 
+	{
 	  if(wxMessageBox(_("File exists. Overwrite?"),
 	                  _("Confirm"), wxYES_NO) != wxYES)
 		return;
 	}
+    }
 
     dialog->OnOK( event );
 }
@@ -120,8 +125,7 @@ char *wxFileSelector(const char *title,
     else
         defaultFilenameString = "";
  
-  wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString,
+    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
-    filter2, flags, wxPoint(x, y));
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
@@ -129,11 +133,12 @@ char *wxFileSelector(const char *title,
         return wxBuffer;
     }
     else
+    {
         return (char *) NULL;
     }
+}
 
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name,
+char* wxLoadFileSelector( const char *what, const char *extension, const char *default_name, wxWindow *parent )
-         wxWindow *parent )
 {
     char *ext = (char *)extension;
 

src/gtk/font.cpp

@@ -16,6 +16,8 @@
 #include "wx/log.h"
 #include <strings.h>
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // local data
 //-----------------------------------------------------------------------------

src/gtk/frame.cpp

@@ -19,6 +19,10 @@
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/dcclient.h"
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk/gauge.cpp

@@ -12,6 +12,8 @@
 #endif
 
 #include "wx/gauge.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // wxGauge

src/gtk/listbox.cpp

@@ -18,6 +18,9 @@
 #include "wx/intl.h"
 #include "wx/checklst.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------

src/gtk/mdi.cpp

@@ -14,9 +14,13 @@
 #include "wx/mdi.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"
-#include "wx/gtk/win_gtk.h"
 #include <wx/intl.h>
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

src/gtk/menu.cpp

@@ -16,6 +16,9 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
@@ -42,10 +45,11 @@ wxMenuBar::wxMenuBar()
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
-  menu->m_title = title;    // ??????
+    menu->m_title = title; 
 
     int pos;
-  do {
+    do 
+    {
         pos = menu->m_title.First( '&' );
         if (pos != -1) menu->m_title.Remove( pos, 1 );
     } while (pos != -1);
@@ -65,6 +69,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
         int res = menu->FindItem( itemString );
         if (res != -1) return res;
     }
+    
     wxNode *node = menu->m_items.First();
     while (node)
     {
@@ -73,6 +78,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
         node = node->Next();
     }
+
     return -1;
 }
 
@@ -89,16 +95,19 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr
     return -1;
 }
 
-// Find a wxMenuItem using its id. Recurses down into sub-menus
+/* Find a wxMenuItem using its id. Recurses down into sub-menus */
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindItem(id);
 
     wxNode *node = menu->m_items.First();
-  while ( node && result == NULL ) {
+    while ( node && result == NULL ) 
+    {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
+	{
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
+	}
         node = node->Next();
     }
 
@@ -115,6 +124,7 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
         result = FindMenuItemByIdRecursive( menu, id );
         node = node->Next();
     }
+    
     return result;
 }
 
@@ -152,7 +162,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
     int id = menu->FindMenuIdByMenuItem(widget);
 
-  // should find it for normal (not popup) menu
+    /* should find it for normal (not popup) menu */
     wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 
 
     if (!menu->IsEnabled(id)) return;
@@ -190,6 +200,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetInt(id );
 
 /*   wxMSW doesn't call callback here either
+
      if (menu->m_callback)
      {
         (void) (*(menu->m_callback)) (*menu, event);
@@ -219,22 +230,19 @@ wxMenuItem::wxMenuItem()
     m_menuItem = (GtkWidget *) NULL;
 }
 
-// it's valid for this function to be called even if m_menuItem == NULL
+/* it's valid for this function to be called even if m_menuItem == NULL */
 void wxMenuItem::SetName( const wxString& str )
 {
     m_text = "";
     for ( const char *pc = str; *pc != '\0'; pc++ )
     {
-    if ( *pc == '&' )
+        if (*pc == '&') pc++; /* skip it */
-      pc++; // skip it
-
         m_text << *pc;
     }
 
     if (m_menuItem)
     {
         GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-
         gtk_label_set( label, m_text.c_str());
     }
 }
@@ -271,7 +279,7 @@ bool wxMenuItem::IsChecked() const
 }
 
 //-----------------------------------------------------------------------------
-// wxMenuItem
+// wxMenu
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
@@ -297,7 +305,7 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
 
 void wxMenu::SetTitle( const wxString& title )
 {
-  // Waiting for something better.
+    /* Waiting for something better. */
     m_title = title;
 }
 
@@ -366,7 +374,8 @@ int wxMenu::FindItem( const wxString itemString ) const
     wxString s( itemString );
 
     int pos;
-  do {
+    do 
+    {
         pos = s.First( '&' );
         if (pos != -1) s.Remove( pos, 1 );
     } while (pos != -1);
@@ -376,7 +385,9 @@ int wxMenu::FindItem( const wxString itemString ) const
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetText() == s)
+	{
             return item->GetId();
+	}
         node = node->Next();
     }
 
@@ -387,47 +398,67 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    { 
         item->Enable(enable);
     }
+}
 
 bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         return item->IsEnabled();
+    }
     else
+    {
         return FALSE;
     }
+}
 
 void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         item->Check(enable);
     }
+}
 
 bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         return item->IsChecked();
+    }
     else
+    {
         return FALSE;
     }
+}
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         item->SetText(label);
     }
+}
 
 wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-  if (item) return item->GetText();
+    if (item)
+    { 
+        return item->GetText();
+    }
+    else
+    {
         return "";
     }
+}
 
 void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
@@ -438,9 +469,15 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-  if (item) return item->GetHelp();
+    if (item)
+    { 
+        return item->GetHelp();
+    }
+    else
+    {
         return "";
     }
+}
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {
@@ -459,16 +496,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 wxMenuItem *wxMenu::FindItem(int id) const
 {
     wxNode *node = m_items.First();
-  while (node) {
+    while (node) 
+    {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)
+	{
             return item;
+	}
         node = node->Next();
     }
 
-  // Not finding anything here can be correct
+    /* Not finding anything here can be correct
-  // when search the entire menu system for
+     * when search the entire menu system for
-  // an entry -> no error message.
+     * an entry -> no error message. */
 
     return (wxMenuItem *) NULL;
 }

src/gtk/minifram.cpp

@@ -14,6 +14,10 @@
 #include "wx/minifram.h"
 #include "wx/dcscreen.h"
 
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
+
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------

src/gtk/notebook.cpp

@@ -17,6 +17,10 @@
 #include "wx/imaglist.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"
 
 //-----------------------------------------------------------------------------

src/gtk/palette.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/palette.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------

src/gtk/pen.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/pen.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------

src/gtk/radiobox.cpp

@@ -15,6 +15,9 @@
 #include "wx/radiobox.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk/radiobut.cpp

@@ -13,6 +13,8 @@
 #endif
 
 #include "wx/radiobut.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // data

src/gtk/region.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/region.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------

src/gtk/scrolbar.cpp

@@ -16,6 +16,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/settings.cpp

@@ -15,6 +15,9 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 #define wxSYS_COLOUR_BACKGROUND        1

src/gtk/slider.cpp

@@ -15,6 +15,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk/spinbutt.cpp

@@ -16,6 +16,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -90,8 +93,10 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
 	
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
+    gtk_signal_connect( GTK_OBJECT (m_adjust), 
-		      (GtkSignalFunc) gtk_spinbutt_callback, (gpointer) this );
+                        "value_changed",
+		        (GtkSignalFunc) gtk_spinbutt_callback, 
+			(gpointer) this );
   
     m_parent->AddChild( this );
 
@@ -138,6 +143,7 @@ void wxSpinButton::SetValue( int value )
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
+    
     m_adjust->value = fpos;
   
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
@@ -152,7 +158,9 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
       
     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))
+    {
         return;
+    }
       
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;

src/gtk/statbmp.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/statbmp.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------

src/gtk/statbox.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/statbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------

src/gtk/stattext.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/stattext.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------

src/gtk/tbargtk.cpp

@@ -13,6 +13,10 @@
 
 #include "wx/toolbar.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -99,6 +103,8 @@ wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
 
 wxToolBar::~wxToolBar()
 {
+    delete m_fg;
+    delete m_bg;
 }
 
 bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
@@ -122,17 +128,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 					    
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
-    m_fg.red = 0;
+    m_fg = new GdkColor;
-    m_fg.green = 0;
+    m_fg->red = 0;
-    m_fg.blue = 0;
+    m_fg->green = 0;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_fg );
+    m_fg->blue = 0;
+    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg );
   
-    m_bg.red = 65535;
+    m_bg = new GdkColor;
-    m_bg.green = 65535;
+    m_bg->red = 65535;
-    m_bg.blue = 50000;
+    m_bg->green = 65535;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_bg );
+    m_bg->blue = 50000;
+    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
   
-    gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg );
+    gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );
 
     m_xMargin = 0;
     m_yMargin = 0;

src/gtk/textctrl.cpp

@@ -20,6 +20,8 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkkeysyms.h"
 
 //-----------------------------------------------------------------------------

src/gtk/threadpsx.cpp

@@ -24,6 +24,9 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 enum thread_state 
 {
   STATE_IDLE = 0,

src/gtk/threadsgi.cpp

@@ -23,7 +23,11 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
-enum thread_state {
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+enum thread_state 
+{
   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,

src/gtk/timer.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/timer.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
@@ -26,7 +28,9 @@ gint timeout_callback( gpointer data )
     timer->Notify();
 
     if (timer->OneShot())
+    {
         timer->Stop();
+    }
 
     return TRUE;
 }
@@ -46,7 +50,9 @@ wxTimer::~wxTimer()
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     if (millisecs != -1)
+    {
         m_time = millisecs;
+    }
 
     m_oneShot = oneShot;
 
@@ -60,7 +66,6 @@ void wxTimer::Stop()
     if (m_tag != -1)
     {
         gtk_timeout_remove( m_tag );
-
         m_tag = -1;
     }
 }

src/gtk/utilsgtk.cpp

@@ -34,7 +34,10 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
-#include "gdk/gdkx.h"        // GDK_DISPLAY
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkx.h"
 
 #ifdef __SVR4__
   #include <sys/systeminfo.h>

src/gtk/window.cpp

@@ -28,11 +28,15 @@
 #include "wx/intl.h"
 #include "wx/settings.h"
 #include "wx/log.h"
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkkeysyms.h"
 
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkprivate.h"
+#include "gdk/gdkkeysyms.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // documentation on internals
 //-----------------------------------------------------------------------------

src/gtk1/app.cpp

@@ -26,6 +26,11 @@
 
 #include "unistd.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------

src/gtk1/bitmap.cpp

@@ -14,9 +14,11 @@
 #include "wx/bitmap.h"
 #include "wx/icon.h"
 #include "wx/filefn.h"
+#include "wx/image.h"
+
+#include "gdk/gdk.h"
 #include "gdk/gdkprivate.h"
 #include "gdk/gdkx.h"
-#include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 // wxMask

src/gtk1/bmpbuttn.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/bmpbuttn.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

src/gtk1/brush.cpp

@@ -13,6 +13,8 @@
 
 #include "wx/brush.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxBrush
 //-----------------------------------------------------------------------------

src/gtk1/button.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/button.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------

src/gtk1/checkbox.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/checkbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/checklst.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/checklst.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 //-----------------------------------------------------------------------------

src/gtk1/choice.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/choice.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/clipbrd.cpp

@@ -13,6 +13,10 @@
 
 #include "wx/clipbrd.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/colour.cpp

@@ -14,6 +14,7 @@
 
 #include "wx/gdicmn.h"
 
+#include "gdk/gdk.h"
 #include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/combobox.cpp

@@ -14,6 +14,9 @@
 #include "wx/combobox.h"
 #include <wx/intl.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/cursor.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/cursor.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxCursor
 //-----------------------------------------------------------------------------

src/gtk1/data.cpp

@@ -21,8 +21,7 @@
 
 #define _MAXPATHLEN 500
 
-// Used for X resources
+/* Used for X resources */
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
@@ -30,50 +29,49 @@
 wxResourceCache *wxTheResourceCache = (wxResourceCache *) NULL;
 XrmDatabase wxResourceDatabase;
 
-// Useful buffer, initialized in wxCommonInit
+/* Useful buffer, initialized in wxCommonInit */
 char *wxBuffer = (char *) NULL;
 
-// Windows List
+/* Windows List */
 wxList wxTopLevelWindows;
 
-// List of windows pending deletion
+/* List of windows pending deletion */
 wxList wxPendingDelete;
 
-// Current cursor, in order to hang on to
+/* Current cursor, in order to hang on to
-// cursor handle when setting the cursor globally
+ * cursor handle when setting the cursor globally */
 wxCursor *g_globalCursor = (wxCursor *) NULL;
 
-// Don't allow event propagation during drag
+/* Don't allow event propagation during drag */
 bool g_blockEventsOnDrag = FALSE;
 
-// Don't allow mouse event propagation during scroll
+/* Don't allow mouse event propagation during scroll */
 bool g_blockEventsOnScroll = FALSE;
 
-// Message Strings for Internationalization
+/* Message Strings for Internationalization */
 char **wx_msg_str = (char**)NULL;
 
-// Custom OS version, as optionally placed in wx.ini/.wxrc
+/* Custom OS version, as optionally placed in wx.ini/.wxrc
-// Currently this can be Win95, Windows, Win32s, WinNT.
+ * Currently this can be Win95, Windows, Win32s, WinNT.
-// For some systems, you can't tell until run-time what services you
+ * For some systems, you can't tell until run-time what services you
-// have. See wxGetOsVersion, which uses this string if present.
+ * have. See wxGetOsVersion, which uses this string if present. */
 char *wxOsVersion = (char *) NULL;
 
-// For printing several pages
+/* For printing several pages */
 int wxPageNumber;
 wxPrintPaperDatabase* wxThePrintPaperDatabase = (wxPrintPaperDatabase *) NULL;
 
-// GDI Object Lists
+/* GDI Object Lists */
 wxBrushList      *wxTheBrushList = (wxBrushList *) NULL;
 wxPenList        *wxThePenList = (wxPenList *) NULL;
 wxFontList       *wxTheFontList = (wxFontList *) NULL;
 wxColourDatabase *wxTheColourDatabase = (wxColourDatabase *) NULL;
 wxBitmapList     *wxTheBitmapList = (wxBitmapList *) NULL;
   
-
+/* X only font names */
-// X only font names
 wxFontNameDirectory *wxTheFontNameDirectory;
 
-// Stock objects
+/* Stock objects */
 wxFont *wxNORMAL_FONT;
 wxFont *wxSMALL_FONT;
 wxFont *wxITALIC_FONT;
@@ -103,7 +101,7 @@ wxBrush *wxLIGHT_GREY_BRUSH;
 
 wxColour *wxBLACK;
 wxColour *wxWHITE;
-wxColour *wxGREY;            // Robert Roebling
+wxColour *wxGREY; 
 wxColour *wxRED;
 wxColour *wxBLUE;
 wxColour *wxGREEN;
@@ -114,7 +112,7 @@ wxCursor *wxSTANDARD_CURSOR = (wxCursor *) NULL;
 wxCursor *wxHOURGLASS_CURSOR = (wxCursor *) NULL;
 wxCursor *wxCROSS_CURSOR = (wxCursor *) NULL;
 
-// 'Null' objects
+/* 'Null' objects */
 wxAcceleratorTable   wxNullAcceleratorTable;
 wxBitmap   wxNullBitmap;
 wxIcon     wxNullIcon;  
@@ -126,7 +124,7 @@ wxColour   wxNullColour;
 wxPalette  wxNullPalette; 
 wxRegion   wxNullRegion; 
 
-// Default window names
+/* Default window names */
 const char *wxButtonNameStr = "button";
 const char *wxCanvasNameStr = "canvas";
 const char *wxCheckBoxNameStr = "check";
@@ -162,610 +160,10 @@ const char *wxFileSelectorDefaultWildcardStr = "*.*";
 const char *wxInternalErrorStr = "wxWindows Internal Error";
 const char *wxFatalErrorStr = "wxWindows Fatal Error";
 
-// See wx/utils.h
+/* See wx/utils.h */
 const char *wxFloatToStringStr = "%.2f";
 const char *wxDoubleToStringStr = "%.2f";
 
-#ifdef wx_msw
+/* Dafaults for wxWindow etc. */
-const char *wxUserResourceStr = "TEXT";
-#endif
-
-
-#if wxUSE_SHARED_LIBRARY
-/*
- * For wxWindows to be made into a dynamic library (e.g. Sun),
- * all IMPLEMENT_... macros must be in one place.
- * But normally, the definitions are in the appropriate places.
- */
-
-// Hand-coded IMPLEMENT... macro for wxObject (define static data)
-wxClassInfo wxObject::classwxObject((char *) "wxObject", (char *) NULL, (char *) NULL, (int ) sizeof(wxObject), (wxObjectConstructorFn) NULL);
-wxClassInfo *wxClassInfo::first = (wxClassInfo *) NULL;
-wxHashTable wxClassInfo::classTable(wxKEY_STRING);
-
-#include "wx/button.h"
-#include "wx/bmpbuttn.h"
-IMPLEMENT_DYNAMIC_CLASS(wxButton, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton)
-
-#include "wx/checkbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
-
-#include "wx/choice.h"
-IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
-
-#if wxUSE_CLIPBOARD
-#include "wx/clipbrd.h"
-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
-#endif
-
-#if wxUSE_COMBOBOX
-#include "wx/combobox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-#endif
-
-#include "wx/dc.h"
-#include "wx/dcmemory.h"
-#include "wx/dcclient.h"
-#include "wx/dcscreen.h"
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxClientDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-
-#if defined(wx_msw)
-#include "wx/dcprint.h"
-IMPLEMENT_CLASS(wxPrinterDC, wxDC)
-#endif
-
-#include "wx/dialog.h"
-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxWindow)
-
-#include "wx/frame.h"
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
-#include "wx/mdi.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
-IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
-
-#include "wx/cmndata.h"
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-
-#include "wx/colordlg.h"
-#include "wx/fontdlg.h"
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-#include "wx/generic/colordlg.h"
-#include "wx/generic/fontdlg.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxGenericFontDialog, wxDialog)
-#endif
-
-// X defines wxColourDialog to be wxGenericColourDialog
-#ifndef wx_x
-IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
-#endif
-
-#include "wx/gdicmn.h"
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/font.h"
-#include "wx/palette.h"
-#include "wx/icon.h"
-#include "wx/cursor.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
-IMPLEMENT_CLASS(wxColourDatabase, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
-
-/*
-#if (!USE_TYPEDEFS)
-IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIntPoint, wxObject)
-#endif
-*/
-
-#if defined(wx_x) || (defined(wx_msw) && wxUSE_PORTABLE_FONTS_IN_MSW)
-IMPLEMENT_DYNAMIC_CLASS(wxFontNameDirectory, wxObject)
-#endif
-
-#include "wx/hash.h"
-IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
-
-#include "wx/help.h"
-IMPLEMENT_DYNAMIC_CLASS(wxHelpInstance, wxClient)
-IMPLEMENT_CLASS(wxHelpConnection, wxConnection)
-
-#include "wx/list.h"
-IMPLEMENT_DYNAMIC_CLASS(wxNode, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxList)
-
-#if wxUSE_PRINTING_ARCHITECTURE
-#include "wx/print.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
-IMPLEMENT_DYNAMIC_CLASS(wxPrinterBase, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptPrinter, wxPrinterBase)
-IMPLEMENT_DYNAMIC_CLASS(wxWindowsPrinter, wxPrinterBase)
-IMPLEMENT_ABSTRACT_CLASS(wxPrintout, wxObject)
-IMPLEMENT_CLASS(wxPreviewCanvas, wxWindow)
-IMPLEMENT_CLASS(wxPreviewControlBar, wxWindow)
-IMPLEMENT_CLASS(wxPreviewFrame, wxFrame)
-IMPLEMENT_CLASS(wxPrintPreviewBase, wxObject)
-IMPLEMENT_CLASS(wxPostScriptPrintPreview, wxPrintPreviewBase)
-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
-IMPLEMENT_CLASS(wxGenericPrintDialog, wxDialog)
-IMPLEMENT_CLASS(wxGenericPrintSetupDialog, wxDialog)
-#endif
-
-#if wxUSE_POSTSCRIPT
-#include "wx/postscrp.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperType, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPrintPaperDatabase, wxList)
-#endif
-
-#if wxUSE_WX_RESOURCES
-#include "wx/resource.h"
-IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
-#endif
-
-#include "wx/event.h"
-IMPLEMENT_DYNAMIC_CLASS(wxEvtHandler, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxEvent, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxScrollEvent, wxCommandEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMouseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxKeyEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSizeEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxEraseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMoveEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxFocusEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxCloseEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxJoystickEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxDropFilesEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxActivateEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxInitDialogEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxSysColourChangedEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxIdleEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxUpdateUIEvent, wxEvent)
-IMPLEMENT_DYNAMIC_CLASS(wxProcessEvent, wxEvent)
-
-#include "wx/utils.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPathList, wxList)
-
-// IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)
-
-#include "wx/process.h"
-IMPLEMENT_DYNAMIC_CLASS(wxProcess, wxEvtHandler)
-
-#if wxUSE_TIMEDATE
-#include "wx/date.h"
-IMPLEMENT_DYNAMIC_CLASS(wxDate, wxObject)
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#include "wx/docview.h"
-//IMPLEMENT_ABSTRACT_CLASS(wxDocItem, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxDocument, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxView, wxEvtHandler)
-IMPLEMENT_ABSTRACT_CLASS(wxDocTemplate, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDocManager, wxEvtHandler)
-IMPLEMENT_CLASS(wxDocChildFrame, wxFrame)
-IMPLEMENT_CLASS(wxDocParentFrame, wxFrame)
-#if wxUSE_PRINTING_ARCHITECTURE
-IMPLEMENT_DYNAMIC_CLASS(wxDocPrintout, wxPrintout)
-#endif
-IMPLEMENT_CLASS(wxCommand, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxCommandProcessor, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFileHistory, wxObject)
-#endif
-
-#if wxUSE_CONSTRAINTS
-#include "wx/layout.h"
-IMPLEMENT_DYNAMIC_CLASS(wxIndividualLayoutConstraint, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxLayoutConstraints, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSizer, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxRowColSizer, wxSizer)
-#endif
-
-#if wxUSE_TOOLBAR
-#include "wx/tbarbase.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarTool, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
-
-#include "wx/tbarsmpl.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
-
-#ifdef wx_msw
-#include "wx/tbarmsw.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
-
-#include "wx/tbar95.h"
-IMPLEMENT_DYNAMIC_CLASS(wxToolBar95, wxToolBarBase)
-#endif
-
-#endif
-
-#include "wx/sckaddr.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxIPV4address, wxSockAddress)
-#ifdef ENABLE_IPV6
-IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress)
-#endif
-#ifndef __UNIX__
-IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress)
-#endif
-
-#include "wx/socket.h"
-
-IMPLEMENT_CLASS(wxSocketBase, wxEvtHandler)
-IMPLEMENT_CLASS(wxSocketClient, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketServer, wxSocketBase)
-IMPLEMENT_CLASS(wxSocketHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxSocketEvent, wxEvent)
-
-#include "wx/url.h"
-
-IMPLEMENT_CLASS(wxProtoInfo, wxObject)
-IMPLEMENT_CLASS(wxURL, wxObject)
-
-#include "wx/protocol/http.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxHTTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxHTTP, "http", "80", TRUE)
-
-#include "wx/protocol/ftp.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFTP, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFTP, "ftp", "21", TRUE)
-
-#include "wx/protocol/sckfile.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileProto, wxProtocol)
-IMPLEMENT_PROTOCOL(wxFileProto, "file", NULL, FALSE)
-
-#include "wx/sckipc.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxTCPServer, wxServerBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPClient, wxClientBase)
-IMPLEMENT_DYNAMIC_CLASS(wxTCPConnection, wxConnectionBase)
-
-#include "wx/statusbr.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxWindow)
-
-BEGIN_EVENT_TABLE(wxStatusBar, wxWindow)
-  EVT_PAINT(wxStatusBar::OnPaint)
-    EVT_SYS_COLOUR_CHANGED(wxStatusBar::OnSysColourChanged)
-END_EVENT_TABLE()
-
-#if wxUSE_TIMEDATE
-#include "wx/time.h"
-IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
-#endif
-
-#if !USE_GNU_WXSTRING
-#include "wx/string.h"
-IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
-#endif
-
-#ifdef wx_motif
-IMPLEMENT_DYNAMIC_CLASS(wxXColormap, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxXFont, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
-#endif
-IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxBrush, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxIcon, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
-IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
-
-// This will presumably be implemented on other platforms too
-#ifdef wx_msw
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxXPMFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxXPMDataHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOFileHandler, wxBitmapHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxICOResourceHandler, wxBitmapHandler)
-#endif
-
-#include "wx/statbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
-
-#if wxUSE_IPC
-#include "wx/dde.h"
-IMPLEMENT_ABSTRACT_CLASS(wxDDEObject, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEServer, wxDDEObject)
-IMPLEMENT_DYNAMIC_CLASS(wxDDEClient, wxDDEObject)
-IMPLEMENT_CLASS(wxDDEConnection, wxObject)
-#endif
-
-IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
-
-#include "wx/listbox.h"
-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
-
-IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-
-#include "wx/menu.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-
-#include "wx/stattext.h"
-#include "wx/statbmp.h"
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBitmap, wxControl)
-
-#if wxUSE_METAFILE
-#include "wx/metafile.h"
-IMPLEMENT_DYNAMIC_CLASS(wxMetaFile, wxObject)
-IMPLEMENT_ABSTRACT_CLASS(wxMetaFileDC, wxDC)
-#endif
-
-#include "wx/radiobox.h"
-#include "wx/radiobut.h"
-IMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl)
-
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-// IMPLEMENT_DYNAMIC_CLASS(wxBitmapRadioButton, wxRadioButton)
-
-#include "wx/scrolbar.h"
-IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxScrollBar, wxControl)
-  EVT_SCROLL(wxScrollBar::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-#include "wx/slider.h"
-IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
-
-#if WXWIN_COMPATIBILITY
-BEGIN_EVENT_TABLE(wxSlider, wxControl)
-  EVT_SCROLL(wxSlider::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-#include "wx/timer.h"
-IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
-
-#include "wx/textctrl.h"
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrl, wxControl)
-
-#include "wx/window.h"
-IMPLEMENT_DYNAMIC_CLASS(wxWindow, wxEvtHandler)
-
-#include "wx/scrolwin.h"
-IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxWindow)
-
-#include "wx/panel.h"
-IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
-
-#include "wx/msgbxdlg.h"
-#include "wx/textdlg.h"
-#include "wx/filedlg.h"
-#include "wx/dirdlg.h"
-#include "wx/choicdlg.h"
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-#include "wx/generic/msgdlgg.h"
-IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
-#endif
-
-IMPLEMENT_CLASS(wxTextEntryDialog, wxDialog)
-IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
-IMPLEMENT_CLASS(wxFileDialog, wxDialog)
-IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-
-#ifdef wx_msw
-IMPLEMENT_CLASS(wxMessageDialog)
-#endif
-
-#if wxUSE_GAUGE
-#ifdef wx_motif
-#include "../../contrib/xmgauge/gauge.h"
-#endif
-#include "wx_gauge.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
-#endif
-
-#include "wx/grid.h"
-IMPLEMENT_DYNAMIC_CLASS(wxGenericGrid, wxPanel)
-
-///// Event tables (also must be in one, statically-linked file for shared libraries)
-
-// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
-const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
-
-const wxEventTable wxEvtHandler::sm_eventTable =
-  { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
-
-const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, 
-#ifdef __SGI_CC__
-	0L
-#else
-	NULL 
-#endif
-	} 
-};
-
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
-  EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-  EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-  EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-  EVT_CHAR_HOOK(wxDialog::OnCharHook)
-  EVT_SYS_COLOUR_CHANGED(wxDialog::OnSysColourChanged)
-  EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxWindow, wxEvtHandler)
-  EVT_CHAR(wxWindow::OnChar)
-  EVT_SIZE(wxWindow::Size)
-  EVT_ERASE_BACKGROUND(wxWindow::OnEraseBackground)
-  EVT_SYS_COLOUR_CHANGED(wxWindow::OnSysColourChanged)
-  EVT_INIT_DIALOG(wxWindow::OnInitDialog)
-  EVT_IDLE(wxWindow::OnIdle)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxScrolledWindow, wxWindow)
-  EVT_SCROLL(wxScrolledWindow::OnScroll)
-  EVT_SIZE(wxScrolledWindow::OnSize)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPanel, wxWindow)
-  EVT_SYS_COLOUR_CHANGED(wxPanel::OnSysColourChanged)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
-  EVT_CHAR(wxTextCtrl::OnChar)
-  EVT_DROP_FILES(wxTextCtrl::OnDropFiles)
-  EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
-END_EVENT_TABLE()
-
-#ifdef wx_msw
-BEGIN_EVENT_TABLE(wxMDIParentWindow, wxFrame)
-  EVT_SIZE(wxMDIParentWindow::OnSize)
-  EVT_ACTIVATE(wxMDIParentWindow::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentWindow::OnSysColourChanged)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
-END_EVENT_TABLE()
-#endif
-
-BEGIN_EVENT_TABLE(wxToolBarBase, wxControl)
-  EVT_SCROLL(wxToolBarBase::OnScroll)
-  EVT_SIZE(wxToolBarBase::OnSize)
-  EVT_IDLE(wxToolBarBase::OnIdle)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
-  EVT_SIZE(wxToolBarSimple::OnSize)
-  EVT_PAINT(wxToolBarSimple::OnPaint)
-  EVT_KILL_FOCUS(wxToolBarSimple::OnKillFocus)
-  EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
-END_EVENT_TABLE()
-
-#ifdef wx_msw
-BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
-  EVT_SIZE(wxToolBarMSW::OnSize)
-  EVT_PAINT(wxToolBarMSW::OnPaint)
-  EVT_MOUSE_EVENTS(wxToolBarMSW::OnMouseEvent)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxToolBar95, wxToolBarBase)
-  EVT_SIZE(wxToolBar95::OnSize)
-  EVT_PAINT(wxToolBar95::OnPaint)
-  EVT_KILL_FOCUS(wxToolBar95::OnKillFocus)
-  EVT_MOUSE_EVENTS(wxToolBar95::OnMouseEvent)
-    EVT_SYS_COLOUR_CHANGED(wxToolBar95::OnSysColourChanged)
-END_EVENT_TABLE()
-#endif
-
-BEGIN_EVENT_TABLE(wxGenericGrid, wxPanel)
-  EVT_SIZE(wxGenericGrid::OnSize)
-  EVT_PAINT(wxGenericGrid::OnPaint)
-  EVT_MOUSE_EVENTS(wxGenericGrid::OnMouseEvent)
-    EVT_TEXT(wxGRID_TEXT_CTRL, wxGenericGrid::OnText)
-    EVT_COMMAND_SCROLL(wxGRID_HSCROLL, wxGenericGrid::OnGridScroll)
-    EVT_COMMAND_SCROLL(wxGRID_VSCROLL, wxGenericGrid::OnGridScroll)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxControl, wxWindow)
-  EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
-END_EVENT_TABLE()
-
-#if !defined(wx_msw) || wxUSE_GENERIC_DIALOGS_IN_MSW
-BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
-  EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
-  EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
-  EVT_BUTTON(wxID_CANCEL, wxGenericMessageDialog::OnCancel)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericColourDialog, wxDialog)
-  EVT_BUTTON(wxID_ADD_CUSTOM, wxGenericColourDialog::OnAddCustom)
-  EVT_SLIDER(wxID_RED_SLIDER, wxGenericColourDialog::OnRedSlider)
-  EVT_SLIDER(wxID_GREEN_SLIDER, wxGenericColourDialog::OnGreenSlider)
-  EVT_SLIDER(wxID_BLUE_SLIDER, wxGenericColourDialog::OnBlueSlider)
-  EVT_PAINT(wxGenericColourDialog::OnPaint)
-  EVT_MOUSE_EVENTS(wxGenericColourDialog::OnMouseEvent)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericFontDialog, wxDialog)
-  EVT_CHECKBOX(wxID_FONT_UNDERLINE, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_STYLE, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_WEIGHT, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_FAMILY, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_COLOUR, wxGenericFontDialog::OnChangeFont)
-  EVT_CHOICE(wxID_FONT_SIZE, wxGenericFontDialog::OnChangeFont)
-  EVT_PAINT(wxGenericFontDialog::OnPaint)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxGenericPrintDialog, wxDialog)
-    EVT_BUTTON(wxID_OK, wxGenericPrintDialog::OnOK)
-    EVT_BUTTON(wxPRINTID_SETUP, wxGenericPrintDialog::OnSetup)
-    EVT_RADIOBOX(wxPRINTID_RANGE, wxGenericPrintDialog::OnRange)
-END_EVENT_TABLE()
-
-#endif
-
-BEGIN_EVENT_TABLE(wxTextEntryDialog, wxDialog)
-  EVT_BUTTON(wxID_OK, wxTextEntryDialog::OnOK)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxSingleChoiceDialog, wxDialog)
-  EVT_BUTTON(wxID_OK, wxSingleChoiceDialog::OnOK)
-END_EVENT_TABLE()
-
-#include "wx/prntbase.h"
-
-BEGIN_EVENT_TABLE(wxPrintAbortDialog, wxDialog)
-  EVT_BUTTON(wxID_CANCEL, wxPrintAbortDialog::OnCancel)
-END_EVENT_TABLE()
-
-BEGIN_EVENT_TABLE(wxPreviewControlBar, wxWindow)
-  EVT_BUTTON(wxID_PREVIEW_CLOSE,     wxPreviewControlBar::OnClose)
-  EVT_BUTTON(wxID_PREVIEW_PRINT,     wxPreviewControlBar::OnPrint)
-  EVT_BUTTON(wxID_PREVIEW_PREVIOUS,   wxPreviewControlBar::OnPrevious)
-  EVT_BUTTON(wxID_PREVIEW_NEXT,     wxPreviewControlBar::OnNext)
-  EVT_CHOICE(wxID_PREVIEW_ZOOM,     wxPreviewControlBar::OnZoom)
-END_EVENT_TABLE()
-
-#endif
-
-
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);

src/gtk1/dc.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/dc.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

src/gtk1/dcclient.cpp

@@ -16,6 +16,9 @@
 #include "wx/image.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // local data
 //-----------------------------------------------------------------------------

src/gtk1/dcmemory.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/dcmemory.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------

src/gtk1/dcps.cpp

@@ -24,6 +24,9 @@
 #include "wx/image.h"
 #include "wx/log.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // start and end of document/page
 //-----------------------------------------------------------------------------

src/gtk1/dcscreen.cpp

@@ -14,6 +14,9 @@
 #include "wx/dcscreen.h"
 #include "wx/window.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // global data initialization
 //-----------------------------------------------------------------------------

src/gtk1/dialog.cpp

@@ -14,6 +14,9 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/dnd.cpp

@@ -18,6 +18,8 @@
 #include "wx/intl.h"
 #include "wx/utils.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkprivate.h"
 
 #include <X11/Xlib.h>

src/gtk1/filedlg.cpp

@@ -16,6 +16,8 @@
 #include "wx/intl.h"
 #include "wx/generic/msgdlgg.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxFileDialog
 //-----------------------------------------------------------------------------
@@ -29,11 +31,14 @@ void gtk_filedialog_ok_callback( GtkWidget *WXUNUSED(widget), gpointer data )
     style = dialog->GetStyle();
 
     if((style&wxSAVE)&&(style&wxOVERWRITE_PROMPT))
-	if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) {
+    {
+	if(wxFileExists(gtk_file_selection_get_filename(GTK_FILE_SELECTION(dialog->m_widget) ))) 
+	{
 	  if(wxMessageBox(_("File exists. Overwrite?"),
 	                  _("Confirm"), wxYES_NO) != wxYES)
 		return;
 	}
+    }
 
     dialog->OnOK( event );
 }
@@ -120,8 +125,7 @@ char *wxFileSelector(const char *title,
     else
         defaultFilenameString = "";
  
-  wxFileDialog fileDialog(parent, title, defaultDirString, defaultFilenameString,
+    wxFileDialog fileDialog( parent, title, defaultDirString, defaultFilenameString, filter2, flags, wxPoint(x, y) );
-    filter2, flags, wxPoint(x, y));
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
@@ -129,11 +133,12 @@ char *wxFileSelector(const char *title,
         return wxBuffer;
     }
     else
+    {
         return (char *) NULL;
     }
+}
 
-char* wxLoadFileSelector(const char *what, const char *extension, const char *default_name,
+char* wxLoadFileSelector( const char *what, const char *extension, const char *default_name, wxWindow *parent )
-         wxWindow *parent )
 {
     char *ext = (char *)extension;
 

src/gtk1/font.cpp

@@ -16,6 +16,8 @@
 #include "wx/log.h"
 #include <strings.h>
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // local data
 //-----------------------------------------------------------------------------

src/gtk1/frame.cpp

@@ -19,6 +19,10 @@
 #include "wx/toolbar.h"
 #include "wx/statusbr.h"
 #include "wx/dcclient.h"
+
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/gauge.cpp

@@ -12,6 +12,8 @@
 #endif
 
 #include "wx/gauge.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // wxGauge

src/gtk1/listbox.cpp

@@ -18,6 +18,9 @@
 #include "wx/intl.h"
 #include "wx/checklst.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-------------------------------------------------------------------------
 // conditional compilation
 //-------------------------------------------------------------------------

src/gtk1/mdi.cpp

@@ -14,9 +14,13 @@
 #include "wx/mdi.h"
 #include "wx/dialog.h"
 #include "wx/menu.h"
-#include "wx/gtk/win_gtk.h"
 #include <wx/intl.h>
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------

src/gtk1/menu.cpp

@@ -16,6 +16,9 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxMenuBar
 //-----------------------------------------------------------------------------
@@ -42,10 +45,11 @@ wxMenuBar::wxMenuBar()
 void wxMenuBar::Append( wxMenu *menu, const wxString &title )
 {
     m_menus.Append( menu );
-  menu->m_title = title;    // ??????
+    menu->m_title = title; 
 
     int pos;
-  do {
+    do 
+    {
         pos = menu->m_title.First( '&' );
         if (pos != -1) menu->m_title.Remove( pos, 1 );
     } while (pos != -1);
@@ -65,6 +69,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
         int res = menu->FindItem( itemString );
         if (res != -1) return res;
     }
+    
     wxNode *node = menu->m_items.First();
     while (node)
     {
@@ -73,6 +78,7 @@ static int FindMenuItemRecursive( const wxMenu *menu, const wxString &menuString
             return FindMenuItemRecursive(item->GetSubMenu(), menuString, itemString);
         node = node->Next();
     }
+
     return -1;
 }
 
@@ -89,16 +95,19 @@ int wxMenuBar::FindMenuItem( const wxString &menuString, const wxString &itemStr
     return -1;
 }
 
-// Find a wxMenuItem using its id. Recurses down into sub-menus
+/* Find a wxMenuItem using its id. Recurses down into sub-menus */
 static wxMenuItem* FindMenuItemByIdRecursive(const wxMenu* menu, int id)
 {
     wxMenuItem* result = menu->FindItem(id);
 
     wxNode *node = menu->m_items.First();
-  while ( node && result == NULL ) {
+    while ( node && result == NULL ) 
+    {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->IsSubMenu())
+	{
             result = FindMenuItemByIdRecursive( item->GetSubMenu(), id );
+	}
         node = node->Next();
     }
 
@@ -115,6 +124,7 @@ wxMenuItem* wxMenuBar::FindMenuItemById( int id ) const
         result = FindMenuItemByIdRecursive( menu, id );
         node = node->Next();
     }
+    
     return result;
 }
 
@@ -152,7 +162,7 @@ static void gtk_menu_clicked_callback( GtkWidget *widget, wxMenu *menu )
 {
     int id = menu->FindMenuIdByMenuItem(widget);
 
-  // should find it for normal (not popup) menu
+    /* should find it for normal (not popup) menu */
     wxASSERT( (id != -1) || (menu->GetInvokingWindow() != NULL) ); 
 
     if (!menu->IsEnabled(id)) return;
@@ -190,6 +200,7 @@ static void gtk_menu_hilight_callback( GtkWidget *widget, wxMenu *menu )
     event.SetInt(id );
 
 /*   wxMSW doesn't call callback here either
+
      if (menu->m_callback)
      {
         (void) (*(menu->m_callback)) (*menu, event);
@@ -219,22 +230,19 @@ wxMenuItem::wxMenuItem()
     m_menuItem = (GtkWidget *) NULL;
 }
 
-// it's valid for this function to be called even if m_menuItem == NULL
+/* it's valid for this function to be called even if m_menuItem == NULL */
 void wxMenuItem::SetName( const wxString& str )
 {
     m_text = "";
     for ( const char *pc = str; *pc != '\0'; pc++ )
     {
-    if ( *pc == '&' )
+        if (*pc == '&') pc++; /* skip it */
-      pc++; // skip it
-
         m_text << *pc;
     }
 
     if (m_menuItem)
     {
         GtkLabel *label = GTK_LABEL( GTK_BIN(m_menuItem)->child );
-
         gtk_label_set( label, m_text.c_str());
     }
 }
@@ -271,7 +279,7 @@ bool wxMenuItem::IsChecked() const
 }
 
 //-----------------------------------------------------------------------------
-// wxMenuItem
+// wxMenu
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenu,wxEvtHandler)
@@ -297,7 +305,7 @@ wxMenu::wxMenu( const wxString& title, const wxFunction func )
 
 void wxMenu::SetTitle( const wxString& title )
 {
-  // Waiting for something better.
+    /* Waiting for something better. */
     m_title = title;
 }
 
@@ -366,7 +374,8 @@ int wxMenu::FindItem( const wxString itemString ) const
     wxString s( itemString );
 
     int pos;
-  do {
+    do 
+    {
         pos = s.First( '&' );
         if (pos != -1) s.Remove( pos, 1 );
     } while (pos != -1);
@@ -376,7 +385,9 @@ int wxMenu::FindItem( const wxString itemString ) const
     {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetText() == s)
+	{
             return item->GetId();
+	}
         node = node->Next();
     }
 
@@ -387,47 +398,67 @@ void wxMenu::Enable( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    { 
         item->Enable(enable);
     }
+}
 
 bool wxMenu::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         return item->IsEnabled();
+    }
     else
+    {
         return FALSE;
     }
+}
 
 void wxMenu::Check( int id, bool enable )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         item->Check(enable);
     }
+}
 
 bool wxMenu::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         return item->IsChecked();
+    }
     else
+    {
         return FALSE;
     }
+}
 
 void wxMenu::SetLabel( int id, const wxString &label )
 {
     wxMenuItem *item = FindItem(id);
     if (item)
+    {
         item->SetText(label);
     }
+}
 
 wxString wxMenu::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-  if (item) return item->GetText();
+    if (item)
+    { 
+        return item->GetText();
+    }
+    else
+    {
         return "";
     }
+}
 
 void wxMenu::SetHelpString( int id, const wxString& helpString )
 {
@@ -438,9 +469,15 @@ void wxMenu::SetHelpString( int id, const wxString& helpString )
 wxString wxMenu::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
-  if (item) return item->GetHelp();
+    if (item)
+    { 
+        return item->GetHelp();
+    }
+    else
+    {
         return "";
     }
+}
 
 int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 {
@@ -459,16 +496,19 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
 wxMenuItem *wxMenu::FindItem(int id) const
 {
     wxNode *node = m_items.First();
-  while (node) {
+    while (node) 
+    {
         wxMenuItem *item = (wxMenuItem*)node->Data();
         if (item->GetId() == id)
+	{
             return item;
+	}
         node = node->Next();
     }
 
-  // Not finding anything here can be correct
+    /* Not finding anything here can be correct
-  // when search the entire menu system for
+     * when search the entire menu system for
-  // an entry -> no error message.
+     * an entry -> no error message. */
 
     return (wxMenuItem *) NULL;
 }

src/gtk1/minifram.cpp

@@ -14,6 +14,10 @@
 #include "wx/minifram.h"
 #include "wx/dcscreen.h"
 
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
+
+
 //-----------------------------------------------------------------------------
 // "clicked"
 //-----------------------------------------------------------------------------

src/gtk1/notebook.cpp

@@ -17,6 +17,10 @@
 #include "wx/imaglist.h"
 #include "wx/intl.h"
 #include "wx/log.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/palette.cpp

@@ -15,6 +15,8 @@
 
 #include "wx/palette.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxPalette
 //-----------------------------------------------------------------------------

src/gtk1/pen.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/pen.h"
 
+#include "gdk/gdk.h"
+
 //-----------------------------------------------------------------------------
 // wxPen
 //-----------------------------------------------------------------------------

src/gtk1/radiobox.cpp

@@ -15,6 +15,9 @@
 #include "wx/radiobox.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/radiobut.cpp

@@ -13,6 +13,8 @@
 #endif
 
 #include "wx/radiobut.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // data

src/gtk1/region.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/region.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxRegion
 //-----------------------------------------------------------------------------

src/gtk1/scrolbar.cpp

@@ -16,6 +16,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/settings.cpp

@@ -15,6 +15,9 @@
 #include "wx/settings.h"
 #include "wx/debug.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 /*
 #define wxSYS_COLOUR_SCROLLBAR         0
 #define wxSYS_COLOUR_BACKGROUND        1

src/gtk1/slider.cpp

@@ -15,6 +15,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------

src/gtk1/spinbutt.cpp

@@ -16,6 +16,9 @@
 #include "wx/utils.h"
 #include <math.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -90,8 +93,10 @@ bool wxSpinButton::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, c
     
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget), (m_windowStyle & wxSP_WRAP) );
 	
-  gtk_signal_connect (GTK_OBJECT (m_adjust), "value_changed",
+    gtk_signal_connect( GTK_OBJECT (m_adjust), 
-		      (GtkSignalFunc) gtk_spinbutt_callback, (gpointer) this );
+                        "value_changed",
+		        (GtkSignalFunc) gtk_spinbutt_callback, 
+			(gpointer) this );
   
     m_parent->AddChild( this );
 
@@ -138,6 +143,7 @@ void wxSpinButton::SetValue( int value )
     float fpos = (float)value;
     m_oldPos = fpos;
     if (fabs(fpos-m_adjust->value) < 0.2) return;
+    
     m_adjust->value = fpos;
   
     gtk_signal_emit_by_name( GTK_OBJECT(m_adjust), "value_changed" );
@@ -152,7 +158,9 @@ void wxSpinButton::SetRange(int minVal, int maxVal)
       
     if ((fabs(fmin-m_adjust->lower) < 0.2) &&
         (fabs(fmax-m_adjust->upper) < 0.2))
+    {
         return;
+    }
       
     m_adjust->lower = fmin;
     m_adjust->upper = fmax;

src/gtk1/statbmp.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/statbmp.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBitmap
 //-----------------------------------------------------------------------------

src/gtk1/statbox.cpp

@@ -13,6 +13,9 @@
 
 #include "wx/statbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------

src/gtk1/stattext.cpp

@@ -14,6 +14,9 @@
 
 #include "wx/stattext.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------

src/gtk1/tbargtk.cpp

@@ -13,6 +13,10 @@
 
 #include "wx/toolbar.h"
 
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
@@ -99,6 +103,8 @@ wxToolBar::wxToolBar( wxWindow *parent, wxWindowID id,
 
 wxToolBar::~wxToolBar()
 {
+    delete m_fg;
+    delete m_bg;
 }
 
 bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
@@ -122,17 +128,19 @@ bool wxToolBar::Create( wxWindow *parent, wxWindowID id,
 					    
     gtk_toolbar_set_tooltips( GTK_TOOLBAR(m_toolbar), TRUE );
 
-    m_fg.red = 0;
+    m_fg = new GdkColor;
-    m_fg.green = 0;
+    m_fg->red = 0;
-    m_fg.blue = 0;
+    m_fg->green = 0;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_fg );
+    m_fg->blue = 0;
+    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_fg );
   
-    m_bg.red = 65535;
+    m_bg = new GdkColor;
-    m_bg.green = 65535;
+    m_bg->red = 65535;
-    m_bg.blue = 50000;
+    m_bg->green = 65535;
-    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), &m_bg );
+    m_bg->blue = 50000;
+    gdk_color_alloc( gtk_widget_get_colormap( GTK_WIDGET(m_toolbar) ), m_bg );
   
-    gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, &m_bg, &m_fg );
+    gtk_tooltips_set_colors( GTK_TOOLBAR(m_toolbar)->tooltips, m_bg, m_fg );
 
     m_xMargin = 0;
     m_yMargin = 0;

src/gtk1/textctrl.cpp

@@ -20,6 +20,8 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 #include "gdk/gdkkeysyms.h"
 
 //-----------------------------------------------------------------------------

src/gtk1/threadpsx.cpp

@@ -24,6 +24,9 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 enum thread_state 
 {
   STATE_IDLE = 0,

src/gtk1/threadsgi.cpp

@@ -23,7 +23,11 @@
 #include "wx/utils.h"
 #include "wx/log.h"
 
-enum thread_state {
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
+enum thread_state 
+{
   STATE_IDLE = 0,
   STATE_RUNNING,
   STATE_CANCELED,

src/gtk1/timer.cpp

@@ -14,6 +14,8 @@
 
 #include "wx/timer.h"
 
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
@@ -26,7 +28,9 @@ gint timeout_callback( gpointer data )
     timer->Notify();
 
     if (timer->OneShot())
+    {
         timer->Stop();
+    }
 
     return TRUE;
 }
@@ -46,7 +50,9 @@ wxTimer::~wxTimer()
 bool wxTimer::Start( int millisecs, bool oneShot )
 {
     if (millisecs != -1)
+    {
         m_time = millisecs;
+    }
 
     m_oneShot = oneShot;
 
@@ -60,7 +66,6 @@ void wxTimer::Stop()
     if (m_tag != -1)
     {
         gtk_timeout_remove( m_tag );
-
         m_tag = -1;
     }
 }

src/gtk1/utilsgtk.cpp

@@ -34,7 +34,10 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
-#include "gdk/gdkx.h"        // GDK_DISPLAY
+#include "glib.h"
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkx.h"
 
 #ifdef __SVR4__
   #include <sys/systeminfo.h>