wxGraphicContext --> wxGraphicsContext

[wxWidgets.git] / include / wx / mac / carbon / button.h

diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h
index 198096673f92fa4845c3aec412b99151d1fabe75..c4abaea100ebf352e042ba6adb8fe4083d40d070 100644 (file)
--- a/include/wx/mac/carbon/button.h
+++ b/include/wx/mac/carbon/button.h
@@ -12,14 +12,10 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[];
 
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
@@ -27,7 +23,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+  inline wxButton(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
@@ -35,34 +32,14 @@ class WXDLLEXPORT wxButton: public wxButtonBase
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
-  
-  inline wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, stock, descriptiveLabel, pos, style, validator, name);
-  }
 
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+  bool Create(wxWindow *parent, wxWindowID id,
+           const wxString& label = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
     
-  bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      return CreateStock(parent, id, stock, descriptiveLabel,
-                         pos, style, validator, name);
-  }
-
     virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
     static wxSize GetDefaultSize();