Explicitly call wxObject ctor in wxColourPropertyValue ctors

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

diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h
index 5735b60555b5d12ebef1b8ccca93f34f9f962cfe..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:


@@ -13,10 +13,8 @@
 #define _WX_BUTTON_H_
 
 // Pushbutton
 #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,
 public:
     wxButton() { }
     wxButton(wxWindow *parent,


@@ -29,31 +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 = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);
     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);

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

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

-    
+

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

-    
+

     // Implementation
     // Implementation

-protected:
+    virtual wxSize GetMinSize() const;

 
 

+protected:

     virtual wxSize DoGetBestSize() const;
 
 private:
     virtual wxSize DoGetBestSize() const;
 
 private:

-
-    virtual wxSize GetMinSize() const;

     wxSize OldGetBestSize() const;
     wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();
     wxSize OldGetBestSize() const;
     wxSize OldGetMinSize() const;
     void SetDefaultShadowThicknessAndResize();

+
+    DECLARE_DYNAMIC_CLASS(wxButton)

 };
 
 };
 

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