workaround a Watcom build

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index 68b67d8c96ff370f261b924f60bbf9041712a222..3b000943defadc3170d05f4b22a78da844a95958 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -1,28 +1,28 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton class
-// Author:      AUTHOR
+// Author:      Stefan Csomor
 // Modified by:
-// Created:     ??/??/98
+// Created:     1998-01-01
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "button.h"
 #endif
 
 #include "wx/control.h"
 #include "wx/gdicmn.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
@@ -42,11 +42,13 @@ class WXDLLEXPORT wxButton: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
+    virtual void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
+    static wxSize GetDefaultSize();
+
   virtual void SetDefault();
-  virtual void SetLabel(const wxString& label);
-  virtual wxString GetLabel() const ;
   virtual void Command(wxCommandEvent& event);
+protected:
+    virtual wxSize DoGetBestSize() const ;
 };
 
 #endif