added convenient wxON_BLOCK_EXIT_THISn() macros wrapping wxON_BLOCK_EXIT_OBJn(*this)

[wxWidgets.git] / interface / button.h

diff --git a/interface/button.h b/interface/button.h
index 4a63ff78a3beb106a37e2f1d203faacab8a7d285..5cc9bad0f732c65b8d7891491eadacde9ff1fe9f 100644 (file)
--- a/interface/button.h
+++ b/interface/button.h
@@ -86,12 +86,12 @@ public:
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = "button");
+             const wxString& name = wxButtonNameStr);
 
     /**
         Destructor, destroying the button.
     */
-    ~wxButton();
+    virtual ~wxButton();
 
     /**
         Button creation function for two-step creation.
@@ -102,15 +102,15 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxValidator& validator,
-                const wxString& name = "button");
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxButtonNameStr);
 
     /**
         Returns the default size for the buttons. It is advised to make all the dialog
         buttons of the same size and this function allows to retrieve the (platform and
         current font dependent size) which should be the best suited for this.
     */
-    wxSize GetDefaultSize();
+    static wxSize GetDefaultSize();
 
     /**
         Returns the string label for the button.