merge of wxMac into main repository

[wxWidgets.git] / include / wx / msw / spinbutt.h

diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h
index f4e119db99700fa2724d0021f49b0d850f5fde64..e7c54bdb3f763696e6909dda3eefc1e965761591 100644 (file)
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -58,8 +58,11 @@ public:
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 
     virtual bool MSWOnScroll(int orientation, WXWORD wParam,
                              WXWORD pos, WXHWND control);
 

+    // a wxSpinButton can't do anything useful with focus, only wxSpinCtrl can
+    virtual bool AcceptsFocus() const { return FALSE; }
+

 protected:
 protected:

-   virtual wxSize DoGetBestSize();
+   virtual wxSize DoGetBestSize() const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxSpinButton)