Added some Motif wxGLCanvas support; some more Motif bugs cured; print dialogs

look OK on Motif now; got rid of some #ifdef wxUSE_... instances


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

include/wx/confbase.h

@@ -20,7 +20,7 @@
 
 #include "wx/defs.h"
 
-#ifdef wxUSE_CONFIG
+#if wxUSE_CONFIG
 
 #include "wx/string.h"
 

include/wx/date.h

@@ -20,7 +20,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 enum wxdate_format_type {wxMDY, wxDAY, wxMONTH, wxFULL, wxEUROPEAN};
 

include/wx/image.h

@@ -28,7 +28,7 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxImageHandler;
-#ifdef wxUSE_LIBPNG
+#if wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler;
 #endif
 class WXDLLEXPORT wxBMPHandler;
@@ -70,7 +70,7 @@ protected:
 // wxPNGHandler
 //-----------------------------------------------------------------------------
 
-#ifdef wxUSE_LIBPNG
+#if wxUSE_LIBPNG
 class WXDLLEXPORT wxPNGHandler: public wxImageHandler
 {
   DECLARE_DYNAMIC_CLASS(wxPNGHandler)

include/wx/motif/radiobox.h

@@ -61,7 +61,7 @@ public:
   void Enable(bool enable);
   void Enable(int item, bool enable);
   void Show(int item, bool show) ;
-  bool Show(bool show) { return wxControl::Show(show); };
+  bool Show(bool show) ;
 
   virtual wxString GetStringSelection() const;
   virtual bool SetStringSelection(const wxString& s);
@@ -77,6 +77,7 @@ public:
   virtual void ChangeForegroundColour();
   WXWidget GetTopWidget() const { return m_formWidget; }
   WXWidget GetLabelWidget() const { return m_labelWidget; }
+  WXWidget GetFrameWidget() const { return m_frameWidget; }
   inline WXWidget* GetRadioButtons() const { return m_radioButtons; }
   inline void SetSel(int i) { m_selectedButton = i; }
 
@@ -88,6 +89,7 @@ protected:
 
   WXWidget          m_formWidget;
   WXWidget          m_labelWidget;
+  WXWidget          m_frameWidget;
   WXWidget*         m_radioButtons;
   wxString*         m_radioButtonLabels;
 };

include/wx/motif/setup.h

@@ -137,6 +137,9 @@
 #define wxUSE_STREAMS       1
                                   // Use wxStream implementation within wxWindows code
 
+#define wxUSE_SERIAL        0
+                                  // Use serialization
+
 /*
  * Finer detail
  *

include/wx/object.h

@@ -101,7 +101,7 @@ public:
 
 WXDLLEXPORT wxObject* wxCreateDynamicObject(const char *name);
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 WXDLLEXPORT wxObject* wxCreateStoredObject( wxInputStream& stream );
 #endif
 
@@ -222,7 +222,7 @@ class WXDLLEXPORT wxObject
   virtual void Dump(ostream& str);
 #endif
 
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   virtual void StoreObject( wxObjectOutputStream &stream );
   virtual void LoadObject( wxObjectInputStream &stream );
 #endif
@@ -238,7 +238,7 @@ class WXDLLEXPORT wxObject
 
 protected:
   wxObjectRefData*      m_refData;
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
   wxObject_Serialize*   m_serialObj;
 #endif
 };

include/wx/stubs/setup.h

@@ -123,6 +123,9 @@
 #define wxUSE_STD_IOSTREAM  1
                                   // Use standard C++ streams if 1. If 0, use wxWin
                                   // streams implementation.
+
+#define wxUSE_SERIAL        0
+                                  // Use serialization
 /*
  * Finer detail
  *

include/wx/thread.h

@@ -369,7 +369,7 @@ public:
 // -----------------------------------------------------------------------------
 // implementation only until the end of file
 // -----------------------------------------------------------------------------
-#ifdef wxUSE_THREADS
+#if wxUSE_THREADS
 #ifdef __WXMSW__
     // unlock GUI if there are threads waiting for and lock it back when
     // there are no more of them - should be called periodically by the main

include/wx/time.h

@@ -14,7 +14,7 @@
 
 #include "wx/object.h"
 
-#ifdef wxUSE_TIMEDATE
+#if wxUSE_TIMEDATE
 
 #ifdef __GNUG__
 #pragma interface "time.h"

include/wx/wx.h

@@ -66,7 +66,7 @@
 #include "wx/cmndata.h"
 #include "wx/intl.h"
 #include "wx/valtext.h"
-#ifdef wxUSE_SERIAL
+#if wxUSE_SERIAL
 #include "wx/objstrm.h"
 #include "wx/serbase.h"
 #endif

include/wx/zstream.h

@@ -17,7 +17,7 @@
 
 #include "wx/defs.h"
 
-#ifdef wxUSE_ZLIB
+#if wxUSE_ZLIB
 
 #include <wx/stream.h>