Reformatted Motif headers; added __WXX11__ symbol support to common headers;

added place-holding src/x11 and include/wx/x11 files.


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

include/wx/accel.h

@@ -75,7 +75,7 @@ public:
     bool operator!=(const wxAcceleratorEntry& entry) const
         { return !(*this == entry); }
 
-#ifdef __WXMOTIF__
+#if defined(__WXMOTIF__) || defined(__WXX11__)
     // Implementation use only
     bool MatchesEvent(const wxKeyEvent& event) const ;
 #endif
@@ -105,6 +105,8 @@ private:
     #include "wx/motif/accel.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/accel.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/accel.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/accel.h"
 #elif defined(__WXPM__)

include/wx/app.h

@@ -375,6 +375,8 @@ protected:
         #include "wx/mgl/app.h"
     #elif defined(__WXGTK__)
         #include "wx/gtk/app.h"
+    #elif defined(__WXX11__)
+        #include "wx/x11/app.h"
     #elif defined(__WXMAC__)
         #include "wx/mac/app.h"
     #elif defined(__WXPM__)

include/wx/bitmap.h

@@ -159,6 +159,8 @@ protected:
 #include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
+#elif defined(__WXX11__)
+#include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
 #elif defined(__WXMAC__)

include/wx/brush.h

@@ -7,6 +7,8 @@
 #include "wx/motif/brush.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
+#elif defined(__WXX11__)
+#include "wx/x11/brush.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/brush.h"
 #elif defined(__WXMAC__)

include/wx/clipbrd.h

@@ -88,6 +88,8 @@ public:
     #include "wx/motif/clipbrd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/clipbrd.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/clipbrd.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)

include/wx/colour.h

@@ -9,6 +9,8 @@
 #include "wx/gtk/colour.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/colour.h"
+#elif defined(__WXX11__)
+#include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/colour.h"
 #elif defined(__WXPM__)

include/wx/cursor.h

@@ -7,6 +7,8 @@
 #include "wx/motif/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
+#elif defined(__WXX11__)
+#include "wx/x11/cursor.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/cursor.h"
 #elif defined(__WXMAC__)

include/wx/dataobj.h

@@ -79,6 +79,8 @@ public:
     #include "wx/motif/dataform.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dataform.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/dataform.h"
 #elif defined(__WXPM__)

include/wx/dc.h

@@ -758,6 +758,8 @@ private:
     #include "wx/motif/dc.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dc.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/dc.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/dc.h"
 #elif defined(__WXMAC__)

include/wx/dcclient.h

@@ -7,6 +7,8 @@
 #include "wx/motif/dcclient.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcclient.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcclient.h"
 #elif defined(__WXMAC__)

include/wx/dcmemory.h

@@ -7,6 +7,8 @@
 #include "wx/motif/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcmemory.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcmemory.h"
 #elif defined(__WXMAC__)

include/wx/dcscreen.h

@@ -7,6 +7,8 @@
 #include "wx/motif/dcscreen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
+#elif defined(__WXX11__)
+#include "wx/x11/dcscreen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/dcscreen.h"
 #elif defined(__WXMAC__)

include/wx/defs.h

@@ -27,7 +27,7 @@
 #error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
       !defined(__WXPM__) && !defined(__WXMAC__) && !defined(__X__) && \
-      !defined(__WXMGL__) && wxUSE_GUI
+      !defined(__WXMGL__) && !defined(__WXX11__) && wxUSE_GUI
 #ifdef __UNIX__
 #error "No Target! You should use wx-config program for compilation flags!"
 #else // !Unix
@@ -424,6 +424,7 @@ enum
     wxGEOS,                   // GEOS
     wxOS2_PM,                 // OS/2 Workplace
     wxWINDOWS,                // Windows or WfW
+    wxMICROWINDOWS,           // MicroWindows
     wxPENWINDOWS,             // Windows for Pen Computing
     wxWINDOWS_NT,             // Windows NT
     wxWIN32S,                 // Windows 32S API
@@ -435,7 +436,8 @@ enum
     wxMGL_OS2,                // MGL on OS/2
     wxMGL_DOS,                // MGL on MS-DOS
     wxWINDOWS_OS2,            // Native OS/2 PM
-    wxUNIX                    // wxBase under Unix
+    wxUNIX,                   // wxBase under Unix
+    wxX11                     // Plain X11 and Universal widgets
 };
 
 // ----------------------------------------------------------------------------
@@ -1852,7 +1854,7 @@ typedef WXRESULT (_System *WXFARPROC)(WXHWND, WXMSGID, WXWPARAM, WXLPARAM);
 #endif //__WXPM__
 
 
-#ifdef __WXMOTIF__
+#if defined(__WXMOTIF__) || defined(__WXX11__)
 /* Stand-ins for X/Xt/Motif types */
 typedef void*           WXWindow;
 typedef void*           WXWidget;

include/wx/dirdlg.h

@@ -21,6 +21,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/dirdlgg.h"
+#elif defined(__WXX11__)
+    #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMGL__)
     #include "wx/generic/dirdlgg.h"
 #elif defined(__WXMAC__)

include/wx/dnd.h

@@ -187,6 +187,8 @@ protected:
     #include "wx/msw/ole/droptgt.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/dnd.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/dnd.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/dnd.h"
 #elif defined(__WXMAC__)

include/wx/dragimag.h

@@ -22,6 +22,11 @@
 #define wxDragImage wxGenericDragImage
 #define sm_classwxDragImage sm_classwxGenericDragImage
 
+#elif defined(__WXX11__)
+#include "wx/generic/dragimgg.h"
+#define wxDragImage wxGenericDragImage
+#define sm_classwxDragImage sm_classwxGenericDragImage
+
 #elif defined(__WXMAC__)
 #include "wx/generic/dragimgg.h"
 #define wxDragImage wxGenericDragImage

include/wx/filedlg.h

@@ -20,6 +20,8 @@ enum
 #include "wx/motif/filedlg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/filedlgg.h"
+#elif defined(__WXX11__)
+#include "wx/generic/filedlg.h"
 #elif defined(__WXMGL__)
 #include "wx/generic/filedlgg.h"
 #elif defined(__WXMAC__)

include/wx/font.h

@@ -166,6 +166,8 @@ private:
     #include "wx/motif/font.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/font.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/font.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/font.h"
 #elif defined(__WXMAC__)

include/wx/gdicmn.h

@@ -166,6 +166,9 @@ enum wxStockCursor
 #elif defined(__WXMOTIF__)
     // Initialize from an included XPM
     #define wxICON(X) wxIcon( X##_xpm )
+#elif defined(__WXX11__)
+    // Initialize from an included XPM
+    #define wxICON(X) wxIcon( X##_xpm )
 #else
     // This will usually mean something on any platform
     #define wxICON(X) wxIcon("" #X "")
@@ -177,7 +180,7 @@ enum wxStockCursor
 
 #if defined(__WXMSW__) || defined(__WXPM__)
     #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE)
-#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXX11__) || defined(__WXMAC__) || defined(__WXMGL__)
     // Initialize from an included XPM
     #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm )
 #else // other platforms
@@ -213,8 +216,7 @@ public:
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
 
-    // accessors
+    // accessors    void Set(int xx, int yy) { x = xx; y = yy; }
-    void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }
     void SetHeight(int h) { y = h; }
 

include/wx/gdiobj.h

@@ -7,6 +7,8 @@
 #include "wx/motif/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
+#elif defined(__WXX11__)
+#include "wx/x11/gdiobj.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/gdiobj.h"
 #elif defined(__WXMAC__)

include/wx/glcanvas.h

@@ -11,6 +11,8 @@
 #include "wx/motif/glcanvas.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/glcanvas.h"
+#elif defined(__WXX11__)
+#include "wx/x11/glcanvas.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/glcanvas.h"
 #elif defined(__WXPM__)

include/wx/icon.h

@@ -13,6 +13,8 @@
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/gtk/icon.h"
+#elif defined(__WXX11__)
+  #include "wx/x11/icon.h"
 #elif defined(__WXMGL__)
   #include "wx/mgl/icon.h"
 #elif defined(__WXMAC__)

include/wx/joystick.h

@@ -9,6 +9,8 @@
 #include "wx/motif/joystick.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"
+#elif defined(__WXX11__)
+#include "wx/x11/joystick.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/joystick.h"
 #elif defined(__WXPM__)

include/wx/mdi.h

@@ -7,6 +7,8 @@
 #include "wx/motif/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
+#elif defined(__WXX11__)
+#include "wx/x11/mdi.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/mdi.h"
 #elif defined(__WXPM__)

include/wx/minifram.h

@@ -7,6 +7,8 @@
 #include "wx/motif/minifram.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/minifram.h"
+#elif defined(__WXX11__)
+#include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/minifram.h"
 #elif defined(__WXPM__)

include/wx/motif/accel.h

@@ -20,58 +20,9 @@
 #include "wx/string.h"
 #include "wx/event.h"
 
-class WXDLLEXPORT wxAcceleratorTable;
-
-#if 0
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no key down
-#define wxACCEL_NORMAL  0x00
-
-class WXDLLEXPORT wxAcceleratorEntry
-{
-public:
-    wxAcceleratorEntry(const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-    wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
-    {
-        m_flags = flags; m_keyCode = keyCode; m_command = cmd;
-    }
-
-    void Set(int flags, int keyCode, int cmd)
-         { m_flags = flags; m_keyCode = keyCode; m_command = cmd; }
-
-    int GetFlags() const { return m_flags; }
-    int GetKeyCode() const { return m_keyCode; }
-    int GetCommand() const { return m_command; }
-
-    void operator = (const wxAcceleratorEntry& entry)
-    {
-        m_flags = entry.m_flags; m_keyCode = entry.m_keyCode; m_command = entry.m_command;
-    }
-
-    // Implementation use only
-    bool MatchesEvent(const wxKeyEvent& event) const;
-
-public:
-    int          m_flags;
-    int          m_keyCode; // ASCII or virtual keycode
-    int          m_command; // Command id to generate
-};
-#endif
-
 class WXDLLEXPORT wxAcceleratorTable: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
     wxAcceleratorTable();
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
@@ -89,7 +40,7 @@ public:
     
     bool Ok() const;
     
-// Implementation only
+    // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };
@@ -97,4 +48,4 @@ public:
 WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
 
 #endif
-    // _WX_ACCEL_H_
+// _WX_ACCEL_H_

include/wx/motif/app.h

@@ -13,7 +13,7 @@
 #define _WX_APP_H_
 
 #ifdef __GNUG__
-    #pragma interface "app.h"
+#pragma interface "app.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -39,7 +39,7 @@ class WXDLLEXPORT wxLog;
 
 class WXDLLEXPORT wxApp : public wxAppBase
 {
-DECLARE_DYNAMIC_CLASS(wxApp)
+    DECLARE_DYNAMIC_CLASS(wxApp)
         
 public:
     wxApp();
@@ -127,5 +127,5 @@ protected:
 int WXDLLEXPORT wxEntry( int argc, char *argv[] );
 
 #endif
-    // _WX_APP_H_
+// _WX_APP_H_
 

include/wx/motif/bitmap.h

@@ -227,4 +227,4 @@ protected:
 wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);
 
 #endif
-  // _WX_BITMAP_H_
+// _WX_BITMAP_H_

include/wx/motif/bmpbuttn.h

@@ -25,7 +25,7 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 class WXDLLEXPORT wxBitmapButton: public wxButton
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
- public:
+public:
     wxBitmapButton();
     ~wxBitmapButton();
     inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
@@ -67,11 +67,11 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
     inline int GetMarginX() { return m_marginX; }
     inline int GetMarginY() { return m_marginY; }
     
-// Implementation
+    // Implementation
     void DoSetBitmap();
     virtual void ChangeBackgroundColour();
     
- protected:
+protected:
     wxBitmap m_buttonBitmapFocus;
     wxBitmap m_buttonBitmap;
     wxBitmap m_buttonBitmapOriginal; // May be different from m_buttonBitmap
@@ -90,4 +90,4 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
 };
 
 #endif
-    // _WX_BMPBUTTN_H_
+// _WX_BMPBUTTN_H_

include/wx/motif/brush.h

@@ -65,7 +65,7 @@ public:
     
     virtual bool Ok() const { return (m_refData != NULL) ; }
     
-// Implementation
+    // Implementation
     
     // Useful helper: create the brush resource
     bool RealizeResource();
@@ -76,4 +76,4 @@ public:
 };
 
 #endif
-    // _WX_BRUSH_H_
+// _WX_BRUSH_H_

include/wx/motif/button.h

@@ -13,7 +13,7 @@
 #define _WX_BUTTON_H_
 
 #ifdef __GNUG__
-    #pragma interface "button.h"
+#pragma interface "button.h"
 #endif
 
 #include "wx/control.h"
@@ -57,4 +57,4 @@ public:
 };
 
 #endif
-    // _WX_BUTTON_H_
+// _WX_BUTTON_H_

include/wx/motif/checkbox.h

@@ -26,7 +26,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxCheckBox)
         
- public:
+public:
     inline wxCheckBox() { }
     inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxCheckBox: public wxControl
     virtual bool GetValue() const ;
     virtual void Command(wxCommandEvent& event);
     
-// Implementation
+    // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
@@ -88,4 +88,4 @@ protected:
         int sizeFlags = wxSIZE_AUTO);
 };
 #endif
-    // _WX_CHECKBOX_H_
+// _WX_CHECKBOX_H_

include/wx/motif/checklst.h

@@ -14,14 +14,14 @@
 #define _WX_CHECKLST_H_
 
 #ifdef __GNUG__
-    #pragma interface "checklst.h"
+#pragma interface "checklst.h"
 #endif
 
 #include "wx/listbox.h"
 
 class wxCheckListBox : public wxListBox
 {
-DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
         
 public:
     // ctors
@@ -44,4 +44,4 @@ private:
 };
 
 #endif
-    // _WX_CHECKLST_H_
+// _WX_CHECKLST_H_

include/wx/motif/choice.h

@@ -98,11 +98,10 @@ protected:
     wxStringList  m_stringList;
     wxList        m_clientList;    // contains the client data for the items
      
-
     virtual void DoSetSize(int x, int y,
         int width, int height,
         int sizeFlags = wxSIZE_AUTO);
 };
 
 #endif
-	// _WX_CHOICE_H_
+// _WX_CHOICE_H_

include/wx/motif/clipbrd.h

@@ -13,7 +13,7 @@
 #define _WX_CLIPBRD_H_
 
 #ifdef __GNUG__
-    #pragma interface "clipbrd.h"
+#pragma interface "clipbrd.h"
 #endif
 
 #if wxUSE_CLIPBOARD
@@ -81,4 +81,4 @@ private:
 #endif // wxUSE_CLIPBOARD
 
 #endif
-    // _WX_CLIPBRD_H_
+// _WX_CLIPBRD_H_

include/wx/motif/colordlg.h

@@ -22,12 +22,12 @@
 #include "wx/cmndata.h"
 
 /*
- * Platform-specific colour dialog implementation
+* Platform-specific colour dialog implementation
- */
+*/
 
 class WXDLLEXPORT wxColourDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
+    DECLARE_DYNAMIC_CLASS(wxColourDialog)
 public:
     wxColourDialog();
     wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
@@ -43,4 +43,4 @@ protected:
 };
 
 #endif
-    // _WX_COLORDLG_H_
+// _WX_COLORDLG_H_

include/wx/motif/colour.h

@@ -22,7 +22,7 @@
 // Colour
 class WXDLLEXPORT wxColour : public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxColour)
+    DECLARE_DYNAMIC_CLASS(wxColour)
 public:
     // ctors
     // default
@@ -89,4 +89,4 @@ public:
 };
 
 #endif
-	// _WX_COLOUR_H_
+// _WX_COLOUR_H_

include/wx/motif/combobox.h

@@ -94,4 +94,4 @@ protected:
 };
 
 #endif
-    // _WX_COMBOBOX_H_
+// _WX_COMBOBOX_H_

include/wx/motif/control.h

@@ -76,4 +76,4 @@ protected:
 };
 
 #endif
-    // _WX_CONTROL_H_
+// _WX_CONTROL_H_

include/wx/motif/cursor.h

@@ -19,13 +19,13 @@
 #include "wx/bitmap.h"
 
 /* Cursor for one display, so we can choose the correct one for
- * the current display.
+* the current display.
- */
+*/
 class wxXCursor : public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxXCursor)
         
- public:
+public:
     WXDisplay*  m_display;
     WXCursor    m_cursor;
 };
@@ -81,4 +81,4 @@ public:
 extern WXDLLEXPORT void wxSetCursor(const wxCursor& cursor);
 
 #endif
-    // _WX_CURSOR_H_
+// _WX_CURSOR_H_

include/wx/motif/dataobj.h

@@ -11,7 +11,7 @@
 #define _WX_MOTIF_DATAOBJ_H_
 
 #ifdef __GNUG__
-    #pragma interface "dataobj.h"
+#pragma interface "dataobj.h"
 #endif
 
 // ----------------------------------------------------------------------------
@@ -20,7 +20,7 @@
 
 class wxDataObject : public wxDataObjectBase
 {
- public:
+public:
 #ifdef __DARWIN__
     ~wxDataObject() { }
 #endif

include/wx/motif/dc.h

@@ -13,7 +13,7 @@
 #define _WX_DC_H_
 
 #ifdef __GNUG__
-    #pragma interface "dc.h"
+#pragma interface "dc.h"
 #endif
 
 #include "wx/pen.h"
@@ -27,14 +27,14 @@
 //-----------------------------------------------------------------------------
 
 #ifndef MM_TEXT
-    #define MM_TEXT         0
+#define MM_TEXT         0
-    #define MM_ISOTROPIC    1
+#define MM_ISOTROPIC    1
-    #define MM_ANISOTROPIC  2
+#define MM_ANISOTROPIC  2
-    #define MM_LOMETRIC     3
+#define MM_LOMETRIC     3
-    #define MM_HIMETRIC     4
+#define MM_HIMETRIC     4
-    #define MM_TWIPS        5
+#define MM_TWIPS        5
-    #define MM_POINTS       6
+#define MM_POINTS       6
-    #define MM_METRIC       7
+#define MM_METRIC       7
 #endif
 
 //-----------------------------------------------------------------------------
@@ -165,4 +165,4 @@ public:
 };
 
 #endif
-    // _WX_DC_H_
+// _WX_DC_H_

include/wx/motif/dcclient.h

@@ -13,7 +13,7 @@
 #define _WX_DCCLIENT_H_
 
 #ifdef __GNUG__
-    #pragma interface "dcclient.h"
+#pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
@@ -174,4 +174,4 @@ public:
 };
 
 #endif
-    // _WX_DCCLIENT_H_
+// _WX_DCCLIENT_H_

include/wx/motif/dcmemory.h

@@ -13,14 +13,14 @@
 #define _WX_DCMEMORY_H_
 
 #ifdef __GNUG__
-    #pragma interface "dcmemory.h"
+#pragma interface "dcmemory.h"
 #endif
 
 #include "wx/dcclient.h"
 
 class wxMemoryDC : public wxWindowDC
 {
-DECLARE_DYNAMIC_CLASS(wxMemoryDC)
+    DECLARE_DYNAMIC_CLASS(wxMemoryDC)
         
 public:
     wxMemoryDC();
@@ -40,4 +40,4 @@ private:
 };
 
 #endif
-    // _WX_DCMEMORY_H_
+// _WX_DCMEMORY_H_

include/wx/motif/dcprint.h

@@ -20,7 +20,7 @@
 
 class WXDLLEXPORT wxPrinterDC: public wxDC
 {
- public:
+public:
     DECLARE_CLASS(wxPrinterDC)
         
     // Create a printer DC
@@ -30,5 +30,5 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
 };
 
 #endif
-    // _WX_DCPRINT_H_
+// _WX_DCPRINT_H_
 

include/wx/motif/dcscreen.h

@@ -22,7 +22,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxScreenDC)
         
- public:
+public:
     // Create a DC representing the whole screen
     wxScreenDC();
     ~wxScreenDC();
@@ -44,5 +44,5 @@ private:
 };
 
 #endif
-    // _WX_DCSCREEN_H_
+// _WX_DCSCREEN_H_
 

include/wx/motif/dialog.h

@@ -13,7 +13,7 @@
 #define _WX_DIALOG_H_
 
 #ifdef __GNUG__
-    #pragma interface "dialog.h"
+#pragma interface "dialog.h"
 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
@@ -21,7 +21,7 @@ WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxDialogBase
 {
-DECLARE_DYNAMIC_CLASS(wxDialog)
+    DECLARE_DYNAMIC_CLASS(wxDialog)
         
 public:
     wxDialog();
@@ -120,4 +120,4 @@ private:
 };
 
 #endif
-    // _WX_DIALOG_H_
+// _WX_DIALOG_H_

include/wx/motif/dirdlg.h

@@ -22,7 +22,7 @@ WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
 
 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxDirDialog)
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
 public:
     wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
         const wxString& defaultPath = "",
@@ -46,4 +46,4 @@ protected:
 };
 
 #endif
-    // _WX_DIRDLG_H_
+// _WX_DIRDLG_H_

include/wx/motif/dnd.h

@@ -43,7 +43,7 @@ class WXDLLEXPORT wxDropSource;
 
 class WXDLLEXPORT wxDropTarget: public wxObject
 {
-  public:
+public:
     
     wxDropTarget();
     ~wxDropTarget();
@@ -66,13 +66,13 @@ class WXDLLEXPORT wxDropTarget: public wxObject
 
 class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
 {
-  public:
+public:
     
     wxTextDropTarget() {};
     virtual bool OnDrop( long x, long y, const void *data, size_t size );
     virtual bool OnDropText( long x, long y, const char *psz );
     
-  protected:
+protected:
     
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
@@ -114,7 +114,7 @@ private:
 
 class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
 {
-  public:
+public:
     
     wxFileDropTarget() {};
     
@@ -122,7 +122,7 @@ class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
     virtual bool OnDropFiles( long x, long y, 
         size_t nFiles, const char * const aszFiles[] );
     
-  protected:
+protected:
     
     virtual size_t GetFormatCount() const;
     virtual wxDataFormat GetFormat(size_t n) const;
@@ -143,7 +143,7 @@ enum wxDragResult
 
 class WXDLLEXPORT wxDropSource: public wxObject
 {
-  public:
+public:
     
     wxDropSource( wxWindow *win );
     wxDropSource( wxDataObject &data, wxWindow *win );
@@ -171,8 +171,8 @@ class WXDLLEXPORT wxDropSource: public wxObject
 
 #endif
 
-   // wxUSE_DRAG_AND_DROP
+// wxUSE_DRAG_AND_DROP
 
 #endif  
-       //_WX_DND_H_
+//_WX_DND_H_
 

include/wx/motif/filedlg.h

@@ -19,15 +19,15 @@
 #include "wx/dialog.h"
 
 /*
- * File selector
+* File selector
- */
+*/
 
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
 WXDLLEXPORT_DATA(extern const char*) wxFileSelectorDefaultWildcardStr;
 
 class WXDLLEXPORT wxFileDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
+    DECLARE_DYNAMIC_CLASS(wxFileDialog)
 public:
     wxString    m_message;
     long        m_dialogStyle;
@@ -95,4 +95,4 @@ WXDLLEXPORT wxString wxLoadFileSelector(const char *what, const char *extension,
 WXDLLEXPORT wxString wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
 
 #endif
-    // _WX_FILEDLG_H_
+// _WX_FILEDLG_H_

include/wx/motif/font.h

@@ -13,7 +13,7 @@
 #define _WX_FONT_H_
 
 #ifdef __GNUG__
-    #pragma interface "font.h"
+#pragma interface "font.h"
 #endif
 
 class wxXFont;
@@ -114,4 +114,4 @@ private:
 };
 
 #endif
-    // _WX_FONT_H_
+// _WX_FONT_H_

include/wx/motif/fontdlg.h

@@ -21,12 +21,12 @@
 #include "wx/cmndata.h"
 
 /*
- * Font dialog
+* Font dialog
- */
+*/
 
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
+    DECLARE_DYNAMIC_CLASS(wxFontDialog)
 public:
     wxFontDialog();
     wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
@@ -42,5 +42,5 @@ protected:
 };
 
 #endif
-    // _WX_FONTDLG_H_
+// _WX_FONTDLG_H_
 

include/wx/motif/frame.h

@@ -13,7 +13,7 @@
 #define _WX_MOTIF_FRAME_H_
 
 #ifdef __GNUG__
-    #pragma interface "frame.h"
+#pragma interface "frame.h"
 #endif
 
 class WXDLLEXPORT wxFrame : public wxFrameBase
@@ -131,4 +131,4 @@ private:
 };
 
 #endif
-    // _WX_MOTIF_FRAME_H_
+// _WX_MOTIF_FRAME_H_

include/wx/motif/gauge.h

@@ -70,4 +70,4 @@ protected:
 };
 
 #endif
-    // _WX_GAUGE_H_
+// _WX_GAUGE_H_

include/wx/motif/gdiobj.h

@@ -29,8 +29,8 @@ public:
 
 class WXDLLEXPORT wxGDIObject: public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxGDIObject)
+    DECLARE_DYNAMIC_CLASS(wxGDIObject)
- public:
+public:
     inline wxGDIObject() { m_visible = FALSE; };
     inline ~wxGDIObject() {};
     
@@ -45,4 +45,4 @@ protected:
 };
 
 #endif
-    // _WX_GDIOBJ_H_
+// _WX_GDIOBJ_H_

include/wx/motif/glcanvas.h

@@ -155,7 +155,7 @@ public:
 };
 
 #endif
-  //  wxUSE_GLCANVAS
+//  wxUSE_GLCANVAS
 
 #endif
-  // _WX_GLCANVAS_H_
+// _WX_GLCANVAS_H_

include/wx/motif/helpxxxx.h

@@ -25,7 +25,7 @@ class WXDLLEXPORT wxXXXXHelpController: public wxHelpControllerBase
 {
     DECLARE_CLASS(wxXXXXHelpController)
         
- public:
+public:
     wxXXXXHelpController();
     ~wxXXXXHelpController();
     
@@ -49,4 +49,4 @@ protected:
 };
 
 #endif
-    // _WX_HELPXXXX_H_
+// _WX_HELPXXXX_H_

include/wx/motif/icon.h

@@ -18,18 +18,6 @@
 
 #include "wx/bitmap.h"
 
-/*
-// Same as for wxBitmap
-class WXDLLEXPORT wxIconRefData: public wxBitmapRefData
-{
-    friend class WXDLLEXPORT wxBitmap;
-    friend class WXDLLEXPORT wxIcon;
-public:
-    wxIconRefData();
-    ~wxIconRefData();
-};
-*/
-
 #define M_ICONDATA ((wxBitmapRefData *)m_refData)
 #define M_ICONHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
 
@@ -66,4 +54,4 @@ public:
 };
 
 #endif
-    // _WX_ICON_H_
+// _WX_ICON_H_

include/wx/motif/joystick.h

@@ -21,9 +21,9 @@
 class WXDLLEXPORT wxJoystick: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
+public:
-  /*
+/*
-   * Public interface
+* Public interface
     */
     
     wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; };
@@ -90,4 +90,4 @@ protected:
 };
 
 #endif
-    // _WX_JOYSTICK_H_
+// _WX_JOYSTICK_H_

include/wx/motif/listbox.h

@@ -28,7 +28,7 @@ WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 // List box item
 class WXDLLEXPORT wxListBox: public wxListBoxBase
 {
-DECLARE_DYNAMIC_CLASS(wxListBox)
+    DECLARE_DYNAMIC_CLASS(wxListBox)
         
 public:
     wxListBox();
@@ -122,4 +122,4 @@ protected:
 };
 
 #endif
-    // _WX_LISTBOX_H_
+// _WX_LISTBOX_H_

include/wx/motif/mdi.h

@@ -35,7 +35,7 @@ class WXDLLEXPORT wxMDIChildFrame;
 
 class WXDLLEXPORT wxMDIParentFrame: public wxFrame
 {
-DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
+    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
         
         friend class WXDLLEXPORT wxMDIChildFrame;
 public:
@@ -86,7 +86,7 @@ public:
     virtual void ActivateNext();
     virtual void ActivatePrevious();
     
-// Implementation
+    // Implementation
     
     // Set the active child
     inline void SetActiveChild(wxMDIChildFrame* child) { m_activeChild = child; }
@@ -116,12 +116,12 @@ protected:
     wxMDIChildFrame*      m_activeChild;
     wxMenuBar*            m_activeMenuBar;
     
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 class WXDLLEXPORT wxMDIChildFrame: public wxFrame
 {
-DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
+    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
         
 public:
     wxMDIChildFrame();
@@ -203,15 +203,15 @@ protected:
 };
 
 /* The client window is a child of the parent MDI frame, and itself
- * contains the child MDI frames.
+* contains the child MDI frames.
- * However, you create the MDI children as children of the MDI parent:
+* However, you create the MDI children as children of the MDI parent:
- * only in the implementation does the client window become the parent
+* only in the implementation does the client window become the parent
- * of the children. Phew! So the children are sort of 'adopted'...
+* of the children. Phew! So the children are sort of 'adopted'...
- */
+*/
 
 class WXDLLEXPORT wxMDIClientWindow: public wxNotebook
 {
-DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
+    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
         
 public:
     wxMDIClientWindow() ;
@@ -247,4 +247,4 @@ private:
 };
 
 #endif
-    // _WX_MDI_H_
+// _WX_MDI_H_

include/wx/motif/menu.h

@@ -13,7 +13,7 @@
 #define _WX_MOTIF_MENU_H_
 
 #ifdef __GNUG__
-    #pragma interface "menu.h"
+#pragma interface "menu.h"
 #endif
 
 #include "wx/colour.h"

include/wx/motif/menuitem.h

@@ -13,7 +13,7 @@
 #define _WX_MOTIF_MENUITEM_H
 
 #ifdef __GNUG__
-    #pragma interface "menuitem.h"
+#pragma interface "menuitem.h"
 #endif
 
 #include "wx/bitmap.h"

include/wx/motif/metafile.h

@@ -11,7 +11,6 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef _WX_METAFIILE_H_
 #define _WX_METAFIILE_H_
 
@@ -22,15 +21,15 @@
 #include "wx/setup.h"
 
 /*
- * Metafile and metafile device context classes - work in Windows 3.1 only
+* Metafile and metafile device context classes - work in Windows 3.1 only
- *
+*
- */
+*/
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxMetaFile: public wxObject
 {
     DECLARE_DYNAMIC_CLASS(wxMetaFile)
- public:
+public:
     wxMetaFile(const wxString& file = "");
     ~wxMetaFile();
     
@@ -42,20 +41,13 @@ class WXDLLEXPORT wxMetaFile: public wxObject
     // TODO
     inline bool Ok() { return FALSE; };
     
-/* TODO: Implementation
-  inline WXHANDLE GetHMETAFILE() { return m_metaFile; }
-  inline void SetHMETAFILE(WXHANDLE mf) { m_metaFile = mf; }
-
-protected:
-  WXHANDLE m_metaFile;
-*/
 };
 
 class WXDLLEXPORT wxMetaFileDC: public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxMetaFileDC)
         
- public:
+public:
     // Don't supply origin and extent
     // Supply them to wxMakeMetaFilePlaceable instead.
     wxMetaFileDC(const wxString& file = "");
@@ -85,11 +77,11 @@ protected:
 };
 
 /*
- * Pass filename of existing non-placeable metafile, and bounding box.
+* Pass filename of existing non-placeable metafile, and bounding box.
- * Adds a placeable metafile header, sets the mapping mode to anisotropic,
+* Adds a placeable metafile header, sets the mapping mode to anisotropic,
- * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
+* and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
- *
+*
- */
+*/
 
 // No origin or extent
 bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale = 1.0);
@@ -98,4 +90,4 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, float scale =
 bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = TRUE);
 
 #endif
-    // _WX_METAFIILE_H_
+// _WX_METAFIILE_H_

include/wx/motif/minifram.h

@@ -43,4 +43,4 @@ protected:
 };
 
 #endif
-    // _WX_MINIFRAM_H_
+// _WX_MINIFRAM_H_

include/wx/motif/msgdlg.h

@@ -52,4 +52,4 @@ protected:
 };
 
 #endif
-    // _WX_MSGBOXDLG_H_
+// _WX_MSGBOXDLG_H_

include/wx/motif/palette.h

@@ -24,7 +24,7 @@ class WXDLLEXPORT wxPalette;
 // Palette for one display
 class wxXPalette : public wxObject
 {
-DECLARE_DYNAMIC_CLASS(wxXPalette)
+    DECLARE_DYNAMIC_CLASS(wxXPalette)
         
 public:
     wxXPalette();
@@ -78,4 +78,4 @@ public:
 };
 
 #endif
-    // _WX_PALETTE_H_
+// _WX_PALETTE_H_

include/wx/motif/pen.h

@@ -88,7 +88,7 @@ public:
     
     inline wxBitmap *GetStipple() const { return (M_PENDATA ? (& M_PENDATA->m_stipple) : (wxBitmap*) NULL); };
     
-// Implementation
+    // Implementation
     
     // Useful helper: create the brush resource
     bool RealizeResource();
@@ -99,4 +99,4 @@ public:
 };
 
 #endif
-    // _WX_PEN_H_
+// _WX_PEN_H_

include/wx/motif/print.h

@@ -19,14 +19,14 @@
 #include "wx/prntbase.h"
 
 /*
- * Represents the printer: manages printing a wxPrintout object
+* Represents the printer: manages printing a wxPrintout object
- */
+*/
 
 class WXDLLEXPORT wxPrinter: public wxPrinterBase
 {
     DECLARE_DYNAMIC_CLASS(wxPrinter)
         
- public:
+public:
     wxPrinter(wxPrintData *data = NULL);
     ~wxPrinter();
     
@@ -36,15 +36,15 @@ class WXDLLEXPORT wxPrinter: public wxPrinterBase
 };
 
 /*
- * wxPrintPreview
+* wxPrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
+* Programmer creates an object of this class to preview a wxPrintout.
- */
+*/
 
 class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 {
     DECLARE_CLASS(wxPrintPreview)
         
- public:
+public:
     wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
     ~wxPrintPreview();
     
@@ -53,4 +53,4 @@ class WXDLLEXPORT wxPrintPreview: public wxPrintPreviewBase
 };
 
 #endif
-    // _WX_PRINT_H_
+// _WX_PRINT_H_

include/wx/motif/printdlg.h

@@ -22,16 +22,16 @@
 #include "wx/cmndata.h"
 
 /*
- * wxPrinterDialog
+* wxPrinterDialog
- * The common dialog for printing.
+* The common dialog for printing.
- */
+*/
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxPrintDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxPrintDialog)
         
- public:
+public:
     wxPrintDialog();
     wxPrintDialog(wxWindow *parent, wxPrintData* data = NULL);
     ~wxPrintDialog();
@@ -42,7 +42,7 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog
     inline wxPrintData& GetPrintData() { return m_printData; }
     virtual wxDC *GetPrintDC();
     
- private:
+private:
     wxPrintData       m_printData;
     wxDC*             m_printerDC;
     wxWindow*         m_dialogParent;
@@ -52,10 +52,10 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 {
     DECLARE_DYNAMIC_CLASS(wxPageSetupDialog)
         
- private:
+private:
     wxPageSetupData   m_pageSetupData;
     wxWindow*         m_dialogParent;
- public:
+public:
     wxPageSetupDialog();
     wxPageSetupDialog(wxWindow *parent, wxPageSetupData *data = NULL);
     ~wxPageSetupDialog();
@@ -67,4 +67,4 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 };
 
 #endif
-    // _WX_PRINTDLG_H_
+// _WX_PRINTDLG_H_

include/wx/motif/private.h

@@ -117,4 +117,4 @@ private:
 extern "C" XtAppContext wxGetAppContext();
 
 #endif
-    // _WX_PRIVATE_H_
+// _WX_PRIVATE_H_

include/wx/motif/radiobox.h

@@ -25,7 +25,7 @@ class WXDLLEXPORT wxBitmap ;
 
 class WXDLLEXPORT wxRadioBox : public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxRadioBox)
+    DECLARE_DYNAMIC_CLASS(wxRadioBox)
         
 public:
     wxRadioBox();
@@ -97,4 +97,4 @@ protected:
 };
 
 #endif
-    // _WX_RADIOBOX_H_
+// _WX_RADIOBOX_H_

include/wx/motif/radiobut.h

@@ -48,7 +48,7 @@ public:
     
     void Command(wxCommandEvent& event);
     
-// Implementation
+    // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
@@ -63,9 +63,9 @@ WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
 class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
+protected:
     wxBitmap *theButtonBitmap;
- public:
+public:
     inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
     inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
         const wxBitmap *label,
@@ -91,4 +91,4 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 #endif
 
 #endif
-    // _WX_RADIOBUT_H_
+// _WX_RADIOBUT_H_

include/wx/motif/region.h

@@ -33,11 +33,11 @@ enum wxRegionContain {
 
 // So far, for internal use only
 enum wxRegionOp {
-wxRGN_AND,          // Creates the intersection of the two combined regions.
+    wxRGN_AND,          // Creates the intersection of the two combined regions.
-wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
+        wxRGN_COPY,         // Creates a copy of the region identified by hrgnSrc1.
-wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+        wxRGN_DIFF,         // Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
-wxRGN_OR,           // Creates the union of two combined regions.
+        wxRGN_OR,           // Creates the union of two combined regions.
-wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
+        wxRGN_XOR           // Creates the union of two combined regions except for any overlapping areas.
 };
 
 class WXDLLEXPORT wxRegion : public wxGDIObject {
@@ -101,7 +101,7 @@ public:
     // Does the region contain the rectangle rect?
     wxRegionContain Contains(const wxRect& rect) const;
     
-// Internal
+    // Internal
     bool Combine(wxCoord x, wxCoord y, wxCoord width, wxCoord height, wxRegionOp op);
     bool Combine(const wxRegion& region, wxRegionOp op);
     bool Combine(const wxRect& rect, wxRegionOp op);
@@ -109,10 +109,10 @@ public:
     // Get the internal Region handle
     WXRegion GetXRegion() const;
     
-// 'Naughty' functions that allow wxWindows to use a list of rects
+    // 'Naughty' functions that allow wxWindows to use a list of rects
-// instead of the region, in certain circumstances (e.g. when
+    // instead of the region, in certain circumstances (e.g. when
-// making a region out of the update rectangles).
+    // making a region out of the update rectangles).
-// These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
+    // These are used by wxPaintDC::wxPaintDC and wxRegionIterator::Reset.
     bool UsingRects() const;
     wxRect* GetRects();
     int GetRectCount() const;
@@ -152,4 +152,4 @@ private:
 };
 
 #endif
-	// _WX_REGION_H_
+// _WX_REGION_H_

include/wx/motif/scrolbar.h

@@ -56,7 +56,7 @@ public:
     
     void Command(wxCommandEvent& event);
     
-// Implementation
+    // Implementation
     virtual void ChangeFont(bool keepOriginalSize = TRUE);
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
@@ -65,9 +65,7 @@ protected:
     int m_pageSize;
     int m_viewSize;
     int m_objectSize;
-
-// DECLARE_EVENT_TABLE()
 };
 
 #endif
-    // _WX_SCROLBAR_H_
+// _WX_SCROLBAR_H_

include/wx/motif/slider.h

@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxSliderNameStr;
 // Slider
 class WXDLLEXPORT wxSlider: public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxSlider)
+    DECLARE_DYNAMIC_CLASS(wxSlider)
         
 public:
     wxSlider();
@@ -98,4 +98,4 @@ private:
 };
 
 #endif
-    // _WX_SLIDER_H_
+// _WX_SLIDER_H_

include/wx/motif/spinbutt.h

@@ -13,7 +13,7 @@
 #define _WX_SPINBUTT_H_
 
 #ifdef __GNUG__
-    #pragma interface "spinbutt.h"
+#pragma interface "spinbutt.h"
 #endif
 
 class WXDLLEXPORT wxSpinButton : public wxSpinButtonBase
@@ -41,7 +41,6 @@ public:
         long style = wxSP_VERTICAL,
         const wxString& name = "wxSpinButton");
        
-
     // accessors
     int GetValue() const;
     int GetMin() const { return m_min; }
@@ -63,4 +62,4 @@ protected:
 };
 
 #endif
-    // _WX_SPINBUTT_H_
+// _WX_SPINBUTT_H_

include/wx/motif/statbmp.h

@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBitmapNameStr;
 
 class WXDLLEXPORT wxStaticBitmap : public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
+    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
         
 public:
     wxStaticBitmap() { }
@@ -81,4 +81,4 @@ protected:
 };
 
 #endif
-    // _WX_STATBMP_H_
+// _WX_STATBMP_H_

include/wx/motif/statbox.h

@@ -23,7 +23,7 @@ WXDLLEXPORT_DATA(extern const char*) wxStaticBoxNameStr;
 // Group box
 class WXDLLEXPORT wxStaticBox: public wxControl
 {
-DECLARE_DYNAMIC_CLASS(wxStaticBox)
+    DECLARE_DYNAMIC_CLASS(wxStaticBox)
         
 public:
     wxStaticBox();
@@ -74,4 +74,4 @@ private:
 };
 
 #endif
-    // _WX_STATBOX_H_
+// _WX_STATBOX_H_

include/wx/motif/stattext.h

@@ -59,4 +59,4 @@ public:
 };
 
 #endif
-    // _WX_STATTEXT_H_
+// _WX_STATTEXT_H_

include/wx/motif/tabctrl.h

@@ -19,8 +19,8 @@
 class wxImageList;
 
 /*
- * Flags returned by HitTest
+* Flags returned by HitTest
- */
+*/
 
 #define wxTAB_HITTEST_NOWHERE           1
 #define wxTAB_HITTEST_ONICON            2
@@ -30,9 +30,9 @@ class wxImageList;
 class WXDLLEXPORT wxTabCtrl: public wxControl
 {
     DECLARE_DYNAMIC_CLASS(wxTabCtrl)
- public:
+public:
-   /*
+/*
-    * Public interface
+* Public interface
     */
     
     wxTabCtrl();
@@ -44,7 +44,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     }
     ~wxTabCtrl();
     
-// Accessors
+    // Accessors
     
     // Get the selection
     int GetSelection() const;
@@ -94,7 +94,7 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
     // Set the padding between tabs
     void SetPadding(const wxSize& padding);
     
-// Operations
+    // Operations
     
     bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
         long style = 0, const wxString& name = "tabCtrl");
@@ -116,23 +116,23 @@ class WXDLLEXPORT wxTabCtrl: public wxControl
 protected:
     wxImageList*    m_imageList;
     
-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
 };
 
 class WXDLLEXPORT wxTabEvent: public wxCommandEvent
 {
     DECLARE_DYNAMIC_CLASS(wxTabEvent)
         
- public:
+public:
     wxTabEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 };
 
 typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
 
 #define EVT_TAB_SEL_CHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGED, \
-  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL ),
+id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL ),
 #define EVT_TAB_SEL_CHANGING(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_COMMAND_TAB_SEL_CHANGING, \
-  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL ),
+id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL ),
 
 #endif
-    // _WX_TABCTRL_H_
+// _WX_TABCTRL_H_

include/wx/motif/taskbar.h

@@ -26,13 +26,13 @@ public:
     wxTaskBarIcon();
     virtual ~wxTaskBarIcon();
     
-// Accessors
+    // Accessors
     
-// Operations
+    // Operations
     bool SetIcon(const wxIcon& icon, const wxString& tooltip = "");
     bool RemoveIcon();
     
-// Overridables
+    // Overridables
     virtual void OnMouseMove();
     virtual void OnLButtonDown();
     virtual void OnLButtonUp();
@@ -41,9 +41,9 @@ public:
     virtual void OnLButtonDClick();
     virtual void OnRButtonDClick();
     
-// Data members
+    // Data members
 protected:
 };
 
 #endif
-    // _WX_TASKBAR_H_
+// _WX_TASKBAR_H_

include/wx/motif/textctrl.h

@@ -13,7 +13,7 @@
 #define _WX_TEXTCTRL_H_
 
 #ifdef __GNUG__
-    #pragma interface "textctrl.h"
+#pragma interface "textctrl.h"
 #endif
 
 WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr;
@@ -148,4 +148,4 @@ private:
 };
 
 #endif
-    // _WX_TEXTCTRL_H_
+// _WX_TEXTCTRL_H_

include/wx/motif/timer.h

@@ -13,12 +13,12 @@
 #define _WX_TIMER_H_
 
 #ifdef __GNUG__
-    #pragma interface "timer.h"
+#pragma interface "timer.h"
 #endif
 
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
-friend void wxTimerCallback(wxTimer * timer);
+    friend void wxTimerCallback(wxTimer * timer);
     
 public:
     wxTimer() { Init(); }
@@ -41,4 +41,4 @@ private:
 };
 
 #endif
-    // _WX_TIMER_H_
+// _WX_TIMER_H_

include/wx/motif/toolbar.h

@@ -13,7 +13,7 @@
 #define _WX_TOOLBAR_H_
 
 #ifdef __GNUG__
-    #pragma interface "toolbar.h"
+#pragma interface "toolbar.h"
 #endif
 
 class WXDLLEXPORT wxToolBar : public wxToolBarBase
@@ -79,4 +79,4 @@ private:
 };
 
 #endif
-    // _WX_TOOLBAR_H_
+// _WX_TOOLBAR_H_

include/wx/motif/wave.h

@@ -41,4 +41,4 @@ private:
 };
 
 #endif
-    // _WX_WAVE_H_
+// _WX_WAVE_H_

include/wx/motif/window.h

@@ -13,7 +13,7 @@
 #define _WX_WINDOW_H_
 
 #ifdef __GNUG__
-    #pragma interface "window.h"
+#pragma interface "window.h"
 #endif
 
 #include "wx/region.h"
@@ -24,8 +24,8 @@
 
 class wxWindow : public wxWindowBase
 {
-friend class WXDLLEXPORT wxDC;
+    friend class WXDLLEXPORT wxDC;
-friend class WXDLLEXPORT wxWindowDC;
+    friend class WXDLLEXPORT wxWindowDC;
     
 public:
     wxWindow() { Init(); }
@@ -355,4 +355,4 @@ protected:
 };
 
 #endif
-    // _WX_WINDOW_H_
+// _WX_WINDOW_H_

include/wx/palette.h

@@ -12,6 +12,8 @@
     #include "wx/motif/palette.h"
 #elif defined(__WXGTK__)
     #include "wx/generic/paletteg.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/palette.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)

include/wx/pen.h

@@ -7,6 +7,8 @@
 #include "wx/motif/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
+#elif defined(__WXX11__)
+#include "wx/x11/pen.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/pen.h"
 #elif defined(__WXMAC__)

include/wx/popupwin.h

@@ -55,6 +55,8 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
+#ifdef __WXX11__
+    #include "wx/x11/popupwin.h"
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"
 #else

include/wx/printdlg.h

@@ -7,6 +7,8 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
+#elif defined(__WXX11__)
+#include "wx/generic/prntdlgg.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/printdlg.h"
 #elif defined(__WXPM__)

include/wx/region.h

@@ -7,6 +7,8 @@
 #include "wx/motif/region.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/region.h"
+#elif defined(__WXX11__)
+#include "wx/x11/region.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/region.h"
 #elif defined(__WXMAC__)

include/wx/timer.h

@@ -107,6 +107,8 @@ protected:
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/timer.h"
 #elif defined(__WXMGL__)
     #include "wx/mgl/timer.h"
 #elif defined(__WXMAC__)

include/wx/toolbar.h

@@ -43,6 +43,8 @@
            #include "wx/motif/toolbar.h"
         #elif defined(__WXGTK__)
            #include "wx/gtk/tbargtk.h"
+        #elif defined(__WXX11__)
+           #include "wx/x11/toolbar.h"
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)

include/wx/toplevel.h

@@ -158,6 +158,9 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowGTK
+#elif defined(__WXX11__)
+    #include "wx/x11/toplevel.h"
+    #define wxTopLevelWindowNative wxTopLevelWindowX11
 #elif defined(__WXMGL__)
     #include "wx/mgl/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMGL

include/wx/window.h

@@ -977,6 +977,14 @@ private:
         #define sm_classwxWindowGTK sm_classwxWindow
     #endif // wxUniv
     #include "wx/gtk/window.h"
+#elif defined(__WXX11__)
+    #ifdef __WXUNIVERSAL__
+        #define wxWindowNative wxWindowX11
+    #else // !wxUniv
+        #define wxWindowX11 wxWindow
+        #define sm_classwxWindowX11 sm_classwxWindow
+    #endif // wxUniv
+    #include "wx/x11/window.h"
 #elif defined(__WXMGL__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowMGL

include/wx/x11/accel.h

@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        accel.h
+// Purpose:     wxAcceleratorTable class
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_ACCEL_H_
+#define _WX_ACCEL_H_
+
+#ifdef __GNUG__
+#pragma interface "accel.h"
+#endif
+
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/event.h"
+
+class WXDLLEXPORT wxAcceleratorTable: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
+public:
+    wxAcceleratorTable();
+    wxAcceleratorTable(const wxString& resource); // Load from .rc resource
+    wxAcceleratorTable(int n, wxAcceleratorEntry entries[]); // Load from array
+    
+    // Copy constructors
+    wxAcceleratorTable(const wxAcceleratorTable& accel) { Ref(accel); }
+    wxAcceleratorTable(const wxAcceleratorTable* accel) { if (accel) Ref(*accel); }
+    
+    ~wxAcceleratorTable();
+    
+    wxAcceleratorTable& operator = (const wxAcceleratorTable& accel) { if (*this == accel) return (*this); Ref(accel); return *this; }
+    bool operator == (const wxAcceleratorTable& accel) { return m_refData == accel.m_refData; }
+    bool operator != (const wxAcceleratorTable& accel) { return m_refData != accel.m_refData; }
+    
+    bool Ok() const;
+    
+    // Implementation only
+    int GetCount() const;
+    wxAcceleratorEntry* GetEntries() const;
+};
+
+WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+
+#endif
+// _WX_ACCEL_H_

include/wx/x11/app.h

@@ -0,0 +1,131 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        app.h
+// Purpose:     wxApp class
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_APP_H_
+#define _WX_APP_H_
+
+#ifdef __GNUG__
+#pragma interface "app.h"
+#endif
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+#include "wx/gdicmn.h"
+#include "wx/event.h"
+
+// ----------------------------------------------------------------------------
+// forward declarations
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFrame;
+class WXDLLEXPORT wxWindow;
+class WXDLLEXPORT wxApp;
+class WXDLLEXPORT wxKeyEvent;
+class WXDLLEXPORT wxLog;
+
+// ----------------------------------------------------------------------------
+// the wxApp class for Motif - see wxAppBase for more details
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxApp : public wxAppBase
+{
+    DECLARE_DYNAMIC_CLASS(wxApp)
+        
+public:
+    wxApp();
+    ~wxApp() {}
+    
+    // override base class (pure) virtuals
+    // -----------------------------------
+    
+    virtual int MainLoop();
+    virtual void ExitMainLoop();
+    virtual bool Initialized();
+    virtual bool Pending();
+    virtual void Dispatch();
+    virtual bool Yield(bool onlyIfNeeded = FALSE);
+    
+    virtual bool OnInitGui();
+    
+    virtual wxIcon GetStdIcon(int which) const;
+    
+    // implementation from now on
+    // --------------------------
+    
+    void OnIdle(wxIdleEvent& event);
+    
+    // Send idle event to all top-level windows.
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents();
+    
+    // Send idle event to window and all subwindows
+    // Returns TRUE if more idle time is requested.
+    bool SendIdleEvents(wxWindow* win);
+    
+    // Motif implementation.
+    
+    // Processes an X event.
+    virtual void ProcessXEvent(WXEvent* event);
+    
+    // Returns TRUE if an accelerator has been processed
+    virtual bool CheckForAccelerator(WXEvent* event);
+    
+    // Returns TRUE if a key down event has been processed
+    virtual bool CheckForKeyDown(WXEvent* event);
+    
+    // Returns TRUE if a key up event has been processed
+    virtual bool CheckForKeyUp(WXEvent* event);
+    
+protected:
+    bool                  m_showOnInit;
+    
+public:
+    // Implementation
+    static bool Initialize();
+    static void CleanUp();
+    
+    void DeletePendingObjects();
+    bool ProcessIdle();
+    
+    // Motif-specific
+    WXAppContext   GetAppContext() const { return m_appContext; }
+    WXWidget       GetTopLevelWidget() const { return m_topLevelWidget; }
+    WXColormap     GetMainColormap(WXDisplay* display);
+    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
+    long           GetMaxRequestSize() const { return m_maxRequestSize; }
+    
+    // This handler is called when a property change event occurs
+    virtual void   HandlePropertyChange(WXEvent *event);
+    
+public:
+    static long    sm_lastMessageTime;
+    int            m_nCmdShow;
+    
+protected:
+    bool                  m_keepGoing;
+    
+    // Motif-specific
+    WXAppContext          m_appContext;
+    WXWidget              m_topLevelWidget;
+    WXColormap            m_mainColormap;
+    WXDisplay*            m_initialDisplay;
+    long                  m_maxRequestSize;
+    
+    DECLARE_EVENT_TABLE()
+};
+
+int WXDLLEXPORT wxEntry( int argc, char *argv[] );
+
+#endif
+// _WX_APP_H_
+

include/wx/x11/bitmap.h

@@ -0,0 +1,230 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        bitmap.h
+// Purpose:     wxBitmap class
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BITMAP_H_
+#define _WX_BITMAP_H_
+
+#ifdef __GNUG__
+#pragma interface "bitmap.h"
+#endif
+
+#include "wx/gdiobj.h"
+#include "wx/gdicmn.h"
+#include "wx/palette.h"
+
+// Bitmap
+class WXDLLEXPORT wxDC;
+class WXDLLEXPORT wxControl;
+class WXDLLEXPORT wxBitmap;
+class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxIcon;
+class WXDLLEXPORT wxCursor;
+class WXDLLEXPORT wxImage;
+
+// A mask is a mono bitmap used for drawing bitmaps
+// transparently.
+class WXDLLEXPORT wxMask: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxMask)
+        
+public:
+    wxMask();
+    
+    // Construct a mask from a bitmap and a colour indicating
+    // the transparent area
+    wxMask(const wxBitmap& bitmap, const wxColour& colour);
+    
+    // Construct a mask from a bitmap and a palette index indicating
+    // the transparent area
+    wxMask(const wxBitmap& bitmap, int paletteIndex);
+    
+    // Construct a mask from a mono bitmap (copies the bitmap).
+    wxMask(const wxBitmap& bitmap);
+    
+    ~wxMask();
+    
+    bool Create(const wxBitmap& bitmap, const wxColour& colour);
+    bool Create(const wxBitmap& bitmap, int paletteIndex);
+    bool Create(const wxBitmap& bitmap);
+    
+    WXPixmap GetPixmap() const { return m_pixmap; }
+    void SetPixmap(WXPixmap pixmap) { m_pixmap = pixmap; }
+    
+protected:
+    WXPixmap      m_pixmap;
+};
+
+class WXDLLEXPORT wxBitmapRefData: public wxGDIRefData
+{
+    friend class WXDLLEXPORT wxBitmap;
+    friend class WXDLLEXPORT wxIcon;
+    friend class WXDLLEXPORT wxCursor;
+public:
+    wxBitmapRefData();
+    ~wxBitmapRefData();
+    
+public:
+    int               m_width;
+    int               m_height;
+    int               m_depth;
+    bool              m_ok;
+    int               m_numColors;
+    wxPalette         m_bitmapPalette;
+    int               m_quality;
+    
+    wxMask *          m_bitmapMask; // Optional mask
+    
+    // Motif implementation
+public:
+    WXPixmap          m_pixmap;
+    WXDisplay*        m_display;
+    bool              m_freePixmap;
+    unsigned long*    m_freeColors;
+    long              m_freeColorsCount;
+    
+    // These 5 variables are for wxControl
+    WXPixmap          m_insensPixmap ;
+    WXPixmap          m_labelPixmap ;
+    WXPixmap          m_armPixmap ;
+    WXImage*          m_image ;
+    WXImage*          m_insensImage ;
+};
+
+#define M_BITMAPDATA ((wxBitmapRefData *)m_refData)
+
+class WXDLLEXPORT wxBitmapHandler: public wxObject
+{
+    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
+public:
+    wxBitmapHandler() { m_name = ""; m_extension = ""; m_type = 0; };
+    
+    virtual bool Create(wxBitmap *bitmap, void *data, long flags, int width, int height, int depth = 1);
+    virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
+        int desiredWidth, int desiredHeight);
+    virtual bool SaveFile(wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
+    
+    void SetName(const wxString& name) { m_name = name; }
+    void SetExtension(const wxString& ext) { m_extension = ext; }
+    void SetType(long type) { m_type = type; }
+    wxString GetName() const { return m_name; }
+    wxString GetExtension() const { return m_extension; }
+    long GetType() const { return m_type; }
+protected:
+    wxString  m_name;
+    wxString  m_extension;
+    long      m_type;
+};
+
+#define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData())
+
+class WXDLLEXPORT wxBitmap: public wxGDIObject
+{
+    DECLARE_DYNAMIC_CLASS(wxBitmap)
+        
+        friend class WXDLLEXPORT wxBitmapHandler;
+    
+public:
+    wxBitmap(); // Platform-specific
+    
+    // Copy constructors
+    wxBitmap(const wxBitmap& bitmap)
+    { Ref(bitmap); }
+    
+    // Initialize with raw XBM data
+    wxBitmap(const char bits[], int width, int height, int depth = 1);
+    
+    // from XPM
+    wxBitmap(const char **data) { (void)CreateFromXpm(data); }
+    wxBitmap(char **data) { (void)CreateFromXpm((const char **)data); }
+    
+    // Initialize with XPM data -- deprecated
+    wxBitmap(char **data, wxControl* control);
+    
+    // Load a file or resource
+    wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);
+    
+    // Constructor for generalised creation from data
+    wxBitmap(void *data, long type, int width, int height, int depth = 1);
+    
+    // If depth is omitted, will create a bitmap compatible with the display
+    wxBitmap(int width, int height, int depth = -1);
+    
+    // Convert from wxImage:  
+    wxBitmap(const wxImage& image, int depth = -1) { (void)CreateFromImage(image, depth); }
+    
+    ~wxBitmap();
+    
+    virtual bool Create(int width, int height, int depth = -1);
+    virtual bool Create(void *data, long type, int width, int height, int depth = 1);
+    
+    wxBitmap GetSubBitmap( const wxRect& rect ) const;
+    
+    virtual bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XPM);
+    virtual bool SaveFile(const wxString& name, int type, const wxPalette *cmap = NULL);
+    
+    wxImage ConvertToImage() const;
+    
+    bool Ok() const { return (M_BITMAPDATA && M_BITMAPDATA->m_ok); }
+    int GetWidth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_width : 0); }
+    int GetHeight() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_height : 0); }
+    int GetDepth() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_depth : 0); }
+    int GetQuality() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_quality : 0); }
+    void SetWidth(int w);
+    void SetHeight(int h);
+    void SetDepth(int d);
+    void SetQuality(int q);
+    void SetOk(bool isOk);
+    
+    wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); }
+    void SetPalette(const wxPalette& palette);
+    
+    wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); }
+    void SetMask(wxMask *mask) ;
+    
+    wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }
+    bool operator == (const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; }
+    bool operator != (const wxBitmap& bitmap) const { return m_refData != bitmap.m_refData; }
+    
+    // Format handling
+    static wxList& GetHandlers() { return sm_handlers; }
+    static void AddHandler(wxBitmapHandler *handler);
+    static void InsertHandler(wxBitmapHandler *handler);
+    static bool RemoveHandler(const wxString& name);
+    static wxBitmapHandler *FindHandler(const wxString& name);
+    static wxBitmapHandler *FindHandler(const wxString& extension, long bitmapType);
+    static wxBitmapHandler *FindHandler(long bitmapType);
+    
+    static void InitStandardHandlers();
+    static void CleanUpHandlers();
+    
+    // Motif implementation
+public:
+    WXDisplay* GetDisplay() const { return M_BITMAPDATA->m_display; }
+    WXPixmap GetPixmap() const { return (WXPixmap) M_BITMAPDATA->m_pixmap; }
+    virtual WXPixmap GetLabelPixmap(WXWidget w) ;
+    virtual WXPixmap GetArmPixmap(WXWidget w) ;
+    virtual WXPixmap GetInsensPixmap(WXWidget w = (WXWidget) 0) ;
+    void SetPixmapNull() { M_BITMAPDATA->m_pixmap = 0; }
+    
+protected:
+    static wxList sm_handlers;
+    
+protected:
+    bool CreateFromXpm(const char **bits);
+    bool CreateFromImage(const wxImage& image, int depth);    
+};
+
+// Creates a bitmap with transparent areas drawn in
+// the given colour.
+wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, wxColour& colour);
+
+#endif
+// _WX_BITMAP_H_

include/wx/x11/brush.h

@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        brush.h
+// Purpose:     wxBrush class
+// Author:      Julian Smart
+// Modified by:
+// Created:     17/09/98
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BRUSH_H_
+#define _WX_BRUSH_H_
+
+#ifdef __GNUG__
+#pragma interface "brush.h"
+#endif
+
+#include "wx/gdicmn.h"
+#include "wx/gdiobj.h"
+#include "wx/bitmap.h"
+
+class WXDLLEXPORT wxBrush;
+
+class WXDLLEXPORT wxBrushRefData: public wxGDIRefData
+{
+    friend class WXDLLEXPORT wxBrush;
+public:
+    wxBrushRefData();
+    wxBrushRefData(const wxBrushRefData& data);
+    ~wxBrushRefData();
+    
+protected:
+    int           m_style;
+    wxBitmap      m_stipple ;
+    wxColour      m_colour;
+};
+
+#define M_BRUSHDATA ((wxBrushRefData *)m_refData)
+
+// Brush
+class WXDLLEXPORT wxBrush: public wxGDIObject
+{
+    DECLARE_DYNAMIC_CLASS(wxBrush)
+        
+public:
+    wxBrush();
+    wxBrush(const wxColour& col, int style);
+    wxBrush(const wxBitmap& stipple);
+    inline wxBrush(const wxBrush& brush) { Ref(brush); }
+    ~wxBrush();
+    
+    virtual void SetColour(const wxColour& col)  ;
+    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b)  ;
+    virtual void SetStyle(int style)  ;
+    virtual void SetStipple(const wxBitmap& stipple)  ;
+    
+    inline wxBrush& operator = (const wxBrush& brush) { if (*this == brush) return (*this); Ref(brush); return *this; }
+    inline bool operator == (const wxBrush& brush) const { return m_refData == brush.m_refData; }
+    inline bool operator != (const wxBrush& brush) const { return m_refData != brush.m_refData; }
+    
+    inline wxColour& GetColour() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_colour : wxNullColour); };
+    inline int GetStyle() const { return (M_BRUSHDATA ? M_BRUSHDATA->m_style : 0); };
+    inline wxBitmap *GetStipple() const { return (M_BRUSHDATA ? & M_BRUSHDATA->m_stipple : 0); };
+    
+    virtual bool Ok() const { return (m_refData != NULL) ; }
+    
+    // Implementation
+    
+    // Useful helper: create the brush resource
+    bool RealizeResource();
+    
+    // When setting properties, we must make sure we're not changing
+    // another object
+    void Unshare();
+};
+
+#endif
+// _WX_BRUSH_H_