Sorry, should be a __UNIX__ test

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

diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h
index 77986f7e87c9bc207908fd18829f95849f479bc7..2728b707394aac52b67771d58d79b916f87a2442 100644 (file)
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -12,7 +12,7 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 


@@ -26,7 +26,7 @@ public:
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,
     wxButton() { }
     wxButton(wxWindow *parent,
              wxWindowID id,

-             const wxString& label,
+             const wxString& label = wxEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,


@@ -38,7 +38,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxString& label,
+                const wxString& label = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -51,9 +51,15 @@ public:
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);
 
     // implementation from now on
     virtual void Command(wxCommandEvent& event);

-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 

+    virtual void ApplyParentThemeBackground(const wxColour& bg)
+    {
+        // avoide switching into owner-drawn mode
+        wxControl::SetBackgroundColour(bg);
+    }
+

 #ifdef __WIN32__
     // coloured buttons support
     virtual bool SetBackgroundColour(const wxColour &colour);
 #ifdef __WIN32__
     // coloured buttons support
     virtual bool SetBackgroundColour(const wxColour &colour);


@@ -66,22 +72,22 @@ private:
 #endif // __WIN32__
 
 protected:
 #endif // __WIN32__
 
 protected:

-    // send a notification event, return TRUE if processed
+    // send a notification event, return true if processed

     bool SendClickEvent();
 
     // default button handling
     void SetTmpDefault();
     void UnsetTmpDefault();
 
     bool SendClickEvent();
 
     // default button handling
     void SetTmpDefault();
     void UnsetTmpDefault();
 

-    static void UpdateDefaultStyle(wxWindow *winDefault,
-                                   wxWindow *winOldDefault);
+    // set or unset BS_DEFPUSHBUTTON style
+    static void SetDefaultStyle(wxButton *btn, bool on);

 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;
 
     // usually overridden base class virtuals
     virtual wxSize DoGetBestSize() const;

-    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const ;

 
 private:
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxButton)
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)

 };
 
 #endif
 };
 
 #endif