Remove assert from wxNativeFontInfo::GetFamily() due to, in case of some gtk+ setup...

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index 3fe881919b094d184a6a88c57e67f827362d28be..c6b02cfc9178143fc249481856482a55331c69a2 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -1,55 +1,5 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
-// Purpose:     wxButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// RCS-ID:      $Id$
-// Copyright:   (c) Stefan Csomor
-// Licence:    wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
-
-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "button.h"
+#ifdef __WXMAC_CLASSIC__
+#include "wx/mac/classic/button.h"
+#else
+#include "wx/mac/carbon/button.h"
 #endif
-
-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
-// Pushbutton
-class WXDLLEXPORT wxButton: public wxButtonBase
-{
-  DECLARE_DYNAMIC_CLASS(wxButton)
- public:
-  inline wxButton() {}
-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-
-       virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;
-    static wxSize GetDefaultSize();
-
-  virtual void SetDefault();
-  virtual void Command(wxCommandEvent& event);
-protected:
-    virtual wxSize DoGetBestSize() const ;
-};
-
-#endif
-    // _WX_BUTTON_H_