Remove duplicated typedef depending on header file version.

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index dc1aec766ff185df933da77dc220a15b45795e1a..32958d5753144ef9ac5382baa3ffde590492918c 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -12,16 +12,12 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "button.h"
 #endif
 
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         
@@ -52,6 +48,7 @@ public:
     // Implementation
 private:
     virtual wxSize DoGetBestSize() const;
+    wxSize OldGetBestSize() const;
     void SetDefaultShadowThicknessAndResize();
 };