addind nonowned window implementation

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 0959a68e3769c6fdb31fed4466284ea925acf42c..58f8ab55fe4fb9058e863729558c98149ebf28a4 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -47,7 +47,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxBitmap;
 
-extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
+extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
@@ -78,6 +78,9 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };