With wxTE_PROCESS_TAB, tabs are now inserted in the text control

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 08fe446a8a37b526d01f308df765831ba809536c..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_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase

 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         
 {
     DECLARE_DYNAMIC_CLASS(wxButton)
         


@@ -50,9 +46,10 @@ public:
     static wxSize GetDefaultSize();
     
     // Implementation
     static wxSize GetDefaultSize();
     
     // Implementation

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
+private:
+    virtual wxSize DoGetBestSize() const;
+    wxSize OldGetBestSize() const;
+    void SetDefaultShadowThicknessAndResize();

 };
 
 #endif
 };
 
 #endif