using #ifdef wxABORT_ON_CONFIG_ERROR not just #if as elsewhere

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 583578d66886ef5bf01e68d4cc339487db2b9eb6..29d201e1113fdba18deee87b7c97821247ecef5a 100644 (file)
--- a/include/wx/motif/button.h
+++ b/include/wx/motif/button.h
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -13,10 +12,8 @@
 #define _WX_BUTTON_H_
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
 {
-    DECLARE_DYNAMIC_CLASS(wxButton)
-
 public:
     wxButton() { }
     wxButton(wxWindow *parent,
@@ -37,23 +34,23 @@ public:
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);
 
-    virtual void SetDefault();
+    virtual wxWindow *SetDefault();
     virtual void Command(wxCommandEvent& event);
 
     static wxSize GetDefaultSize();
 
     // Implementation
-protected:
+    virtual wxSize GetMinSize() const;
 
+protected:
     virtual wxSize DoGetBestSize() const;
 
 private:
-
-    virtual wxSize GetMinSize() const;
     wxSize OldGetBestSize() const;
     wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();
+
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
-#endif
-// _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_