Complete rewrite of DoDrawBitmap() and DoBlit().

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 1143afed78d5a04759a388c9100b2774ca1003a1..519d0b7ffefd0cfadffbedf4c08fb4be038132b0 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -12,10 +12,6 @@
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 
 #ifndef _WX_BUTTON_H_BASE_
 #define _WX_BUTTON_H_BASE_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "buttonbase.h"
-#endif
-

 #include "wx/defs.h"
 
 // ----------------------------------------------------------------------------
 #include "wx/defs.h"
 
 // ----------------------------------------------------------------------------


@@ -29,7 +25,7 @@
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
 #define wxBU_BOTTOM          0x0200
 #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
 #endif
 
 #if wxUSE_BUTTON


@@ -48,17 +44,16 @@
 #define wxBU_EXACTFIT        0x0001
 
 #include "wx/control.h"
 #define wxBU_EXACTFIT        0x0001
 
 #include "wx/control.h"

-#include "wx/stockitem.h"

 
 

-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 
 

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

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

-class WXDLLEXPORT wxButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxButtonBase : public wxControl

 {
 public:
     wxButtonBase() { }
 {
 public:
     wxButtonBase() { }


@@ -69,9 +64,10 @@ public:
     // set the margins around the image
     virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
 
     // set the margins around the image
     virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
 

-    // this wxButton method is called when the button becomes the default one
-    // on its panel
-    virtual void SetDefault() { }
+    // make this button the default button in its top level window
+    //
+    // returns the old default item (possibly NULL)
+    virtual wxWindow *SetDefault();

 
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here
 
     // Buttons on MSW can look bad if they are not native colours, because
     // then they become owner-drawn and not theme-drawn.  Disable it here


@@ -82,15 +78,8 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
     static wxSize GetDefaultSize();
 
 protected:

-#ifndef __WXGTK20__
-    // 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
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }

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


@@ -101,14 +90,18 @@ protected:
     #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__)
 #elif defined(__WXMAC__)

-    #include "wx/mac/button.h"
+    #include "wx/osx/button.h"

 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/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