only declare AddProcessCallback for wxMotif and wxGTK

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 08fe446a8a37b526d01f308df765831ba809536c..0ac026222d906b083de1fdc1a1da6d99a13c0901 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        button.h
+// Name:        wx/motif/button.h

 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxButton class
 // Author:      Julian Smart
 // Modified by:


@@ -12,24 +12,14 @@
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-

 // Pushbutton
 // Pushbutton

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxButton)
-        

 public:
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,
 public:
     wxButton() { }
     wxButton(wxWindow *parent,
         wxWindowID id,

-        const wxString& label,
+        const wxString& label = wxEmptyString,

         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,


@@ -37,23 +27,31 @@ public:
     {
         Create(parent, id, label, pos, size, style, validator, name);
     }
     {
         Create(parent, id, label, pos, size, 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);
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);

-    
-    virtual void SetDefault();
+
+    virtual wxWindow *SetDefault();

     virtual void Command(wxCommandEvent& event);
     virtual void Command(wxCommandEvent& event);

-    
+

     static wxSize GetDefaultSize();
     static wxSize GetDefaultSize();

-    
+

     // Implementation
     // Implementation

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

 };
 
 };
 

-#endif
-// _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_