create greyed image for wxBitmapButton in MSW automatically, as in wxGTK (replaces...

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 092a589d871b676d7e354325f4b44a3ef9fc9d34..15de85ecd50cd0a312abc66efd559d6c98be42d7 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -14,22 +14,18 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {

- public:
+public:

     inline wxButton() {}
     inline wxButton( wxWindow*          pParent
                     ,wxWindowID         vId
     inline wxButton() {}
     inline wxButton( wxWindow*          pParent
                     ,wxWindowID         vId

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

                     ,const wxPoint&     rPos = wxDefaultPosition
                     ,const wxSize&      rSize = wxDefaultSize
                     ,long               lStyle = 0
                     ,const wxPoint&     rPos = wxDefaultPosition
                     ,const wxSize&      rSize = wxDefaultSize
                     ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                     ,const wxValidator& rValidator = wxDefaultValidator
                     ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                     ,const wxString&    rsName = wxButtonNameStr
                    )
     {
                     ,const wxString&    rsName = wxButtonNameStr
                    )
     {


@@ -39,28 +35,25 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
                ,rsName
               );
     }
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId

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

                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxButtonNameStr
                );
 
     virtual ~wxButton();
 
                 ,const wxString&    rsName = wxButtonNameStr
                );
 
     virtual ~wxButton();
 

-    virtual void     SetDefault(void);
+    virtual wxWindow *SetDefault();
+

     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam
     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam


@@ -82,8 +75,18 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
 protected:
 
 
 protected:
 

-    bool           SendClickEvent(void);
-    virtual wxSize DoGetBestSize(void) const;
+    bool            SendClickEvent(void);
+    void            SetTmpDefault(void);
+    void            UnsetTmpDefault(void);
+
+    static void     SetDefaultStyle( wxButton* pButton
+                                    ,bool      bOn
+                                   );
+
+    virtual wxSize  DoGetBestSize(void) const;
+    virtual WXDWORD OS2GetStyle( long     style
+                                ,WXDWORD* exstyle
+                               ) const;

 private:
   DECLARE_DYNAMIC_CLASS(wxButton)
 }; // end of CLASS wxButton
 private:
   DECLARE_DYNAMIC_CLASS(wxButton)
 }; // end of CLASS wxButton