removed WXDLLEXPORT_CTORFN (was always empty anyhow)

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index d4f92f470dae20d37f28fdb9d54bef52e62f6040..ba408a4214daf06d771135cd4ab68690d4545d7f 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -25,9 +25,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                     ,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,9 +35,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
                ,rPos
                ,rSize
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -50,9 +46,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                 ,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
                );
 


@@ -80,8 +74,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