Add tar streams.

[wxWidgets.git] / include / wx / button.h

diff --git a/include/wx/button.h b/include/wx/button.h
index 1e7f14a0f77e406c309a569e209d1859fe953624..ee53cf704d8c3144247e2d636169a9884dff5238 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -14,21 +14,29 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if wxUSE_BUTTON
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// wxButton flags
+// wxButton flags shared with other classes

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// These two flags are obsolete
-#define wxBU_NOAUTODRAW      0x0000
-#define wxBU_AUTODRAW        0x0004
+#if wxUSE_TOGGLEBTN || wxUSE_BUTTON

 
 // These flags affect label alignment
 #define wxBU_LEFT            0x0040
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 
 // These flags affect label alignment
 #define wxBU_LEFT            0x0040
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200

+#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
+#endif
+
+#if wxUSE_BUTTON
+
+// ----------------------------------------------------------------------------
+// wxButton specific flags
+// ----------------------------------------------------------------------------
+
+// These two flags are obsolete
+#define wxBU_NOAUTODRAW      0x0000
+#define wxBU_AUTODRAW        0x0004

 
 // by default, the buttons will be created with some (system dependent)
 // minimal size to make them look nicer, giving this style will make them as
 
 // by default, the buttons will be created with some (system dependent)
 // minimal size to make them look nicer, giving this style will make them as


@@ -39,7 +47,7 @@
 
 class WXDLLEXPORT wxBitmap;
 
 
 class WXDLLEXPORT wxBitmap;
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button


@@ -68,6 +76,7 @@ public:
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 

+protected:

     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 


@@ -77,14 +86,18 @@ public:
     #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/button.h"
     #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
     #include "wx/motif/button.h"

-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)

     #include "wx/gtk/button.h"
     #include "wx/gtk/button.h"

+#elif defined(__WXGTK__)
+    #include "wx/gtk1/button.h"

 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"

+#elif defined(__WXPALMOS__)
+    #include "wx/palmos/button.h"

 #endif
 
 #endif // wxUSE_BUTTON
 #endif
 
 #endif // wxUSE_BUTTON