added alpha channel support to wxGTK2's wxBitmap

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 1e7f14a0f77e406c309a569e209d1859fe953624..3ddac2830eeab9e9e47a1302cffcd0b88ee337a6 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,17 +12,17 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
-#include "wx/defs.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "buttonbase.h"
+#endif
 
-#if wxUSE_BUTTON
+#include "wx/defs.h"
 
 // ----------------------------------------------------------------------------
-// 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
@@ -30,12 +30,25 @@
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 
+#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
 // small as possible
 #define wxBU_EXACTFIT        0x0001
 
 #include "wx/control.h"
+#include "wx/stockitem.h"
 
 class WXDLLEXPORT wxBitmap;
 
@@ -68,6 +81,17 @@ public:
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 
+protected:
+#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__)
+    // create stock button (generic implementation)
+    bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+                     const wxString& descriptiveLabel = wxEmptyString,
+                     const wxPoint& pos = wxDefaultPosition,
+                     long style = 0,
+                     const wxValidator& validator = wxDefaultValidator,
+                     const wxString& name = wxButtonNameStr);
+#endif
+
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };