More work on getting wxLisBox events right

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 89bef2b6b5b3a5bc0da5f5c94bb37dff98e45665..250f53129cea5428c096af388fab2303b8467eac 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -45,15 +45,15 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-class WXDLLEXPORT wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;

 
 

-extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[];
+extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];

 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     wxButtonBase() { }
 {
 public:
     wxButtonBase() { }


@@ -78,6 +78,9 @@ public:
     static wxSize GetDefaultSize();
 
 protected:
     static wxSize GetDefaultSize();
 
 protected:

+    // choose the default border for this window
+    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
+

     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxButtonBase)
 };