SetTextColour is gone

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index ebfe1c1a35668a06c73cbd13f5403eeb13b4b8bb..272bb088992c72321f8de526ed987da7e9e74419 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -21,13 +21,11 @@ class WXDLLEXPORT wxButton: public wxButtonBase
     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
                    )
     {


@@ -37,25 +35,21 @@ 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
                );
                 ,const wxString&    rsName = wxButtonNameStr
                );

-
+    

     virtual ~wxButton();
 
     virtual void     SetDefault(void);
     virtual ~wxButton();
 
     virtual void     SetDefault(void);


@@ -81,6 +75,13 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 protected:
 
     bool            SendClickEvent(void);
 protected:
 
     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
     virtual wxSize  DoGetBestSize(void) const;
     virtual WXDWORD OS2GetStyle( long     style
                                 ,WXDWORD* exstyle