correct access for virtuals, other minor corrections

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/univ/tglbtn.h b/include/wx/univ/tglbtn.h
index 1fcdd76c7c0264a547e4abca975ba8f5660cb96f..31dabca60635f2eb1cffdd86d0728272de140f90 100644 (file)
--- a/include/wx/univ/tglbtn.h
+++ b/include/wx/univ/tglbtn.h
@@ -12,10 +12,9 @@
 #ifndef _WX_UNIV_TGLBTN_H_
 #define _WX_UNIV_TGLBTN_H_
 
-class WXDLLEXPORT wxInputHandler;
-
 #include "wx/bitmap.h"
-#include "wx/checkbox.h"
+
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
@@ -106,17 +105,18 @@ public:
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 
-protected:
     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
+
+    virtual bool CanBeHighlighted() const { return true; }
+
+protected:
     virtual wxSize DoGetBestClientSize() const;
     
     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 
-    virtual bool CanBeHighlighted() const { return true; }
-
     // common part of all ctors
     void Init();
 

diff --git a/src/univ/tglbtn.cpp b/src/univ/tglbtn.cpp
index 6a13b3ff7280eb57dfc2ec891bf2bdf61de46fd7..3a0b9b803ade79599d5ba7ab36b39ed0d33da12a 100644 (file)
--- a/src/univ/tglbtn.cpp
+++ b/src/univ/tglbtn.cpp
@@ -25,6 +25,8 @@
 
 #if wxUSE_TOGGLEBTN
 
+#include "wx/tglbtn.h"
+
 #ifndef WX_PRECOMP
     #include "wx/dcclient.h"
     #include "wx/dcscreen.h"
@@ -38,7 +40,6 @@
 #include "wx/univ/theme.h"
 #include "wx/univ/colschem.h"
 #include "wx/stockitem.h"
-#include "wx/tglbtn.h"
 
 // ----------------------------------------------------------------------------
 // constants