Significantly improved wxPropertyGrid's top-level parent change detection code (fixes...

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

diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index 59e97a533ae57bd9122944791433c331c03d761b..9c41fb392c5ef38755b7a377fe6bfd1fc1d2f6e1 100644 (file)
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -29,7 +29,7 @@ class WXDLLIMPEXP_FWD_CORE wxInputHandler;
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxButton : public wxButtonBase
+class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
 {
 public:
     wxButton() { Init(); }
@@ -87,8 +87,6 @@ public:
 
     virtual ~wxButton();
 
-    virtual void SetImageLabel(const wxBitmap& bitmap);
-    virtual void SetImageMargins(wxCoord x, wxCoord y);
     virtual wxWindow *SetDefault();
 
     virtual bool IsPressed() const { return m_isPressed; }
@@ -119,6 +117,9 @@ protected:
     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 
+    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
+    virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
+
     // common part of all ctors
     void Init();