guarding agains NULL

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

diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index 48a82144500bb2de19703bc7d0928bdf635ffdb3..602644fe2c8cc9d29d0456ccc843e060f244b62d 100644 (file)
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/osx/button.h

 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxButton class
 // Author:      Stefan Csomor
 // Modified by:


@@ -41,8 +41,6 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 

-    static wxSize GetDefaultSize();
-

     virtual void SetLabel(const wxString& label);
     virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);
     virtual void SetLabel(const wxString& label);
     virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);


@@ -52,14 +50,6 @@ public:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:
     virtual bool        OSXHandleClicked( double timestampsec );
 
 protected:

-    virtual wxSize DoGetBestSize() const ;
-
-#if wxOSX_USE_COCOA
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-#endif // wxOSX_USE_COCOA
-

     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 


@@ -72,7 +62,7 @@ public:
              const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              const wxString& label = wxEmptyString,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,

-             long style = 0,
+             long style = wxBORDER_NONE,

              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {
              const wxValidator& validator = wxDefaultValidator,
              const wxString& name = wxButtonNameStr)
     {


@@ -84,7 +74,7 @@ public:
                 const wxString& label = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 const wxString& label = wxEmptyString,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,

-                long style = 0,
+                long style = wxBORDER_NONE,

                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxButtonNameStr);
 


@@ -97,7 +87,6 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const ;
 
 protected:
     virtual wxSize DoGetBestSize() const ;

-

 };
 
 #endif // _WX_OSX_BUTTON_H_
 };
 
 #endif // _WX_OSX_BUTTON_H_