renamed m_boxes to m_buttons because, well, it contains the radio buttons and not...

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

diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index 68a56beb8e8bd5ad0e5fed4337aea830634ea083..8e626cb137e260f32ca643eaa2720f4e5dd461a8 100644 (file)
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_BUTTON_H_
 #define _WX_UNIV_BUTTON_H_
 
 #ifndef _WX_UNIV_BUTTON_H_
 #define _WX_UNIV_BUTTON_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univbutton.h"
-#endif
-

 class WXDLLEXPORT wxInputHandler;
 
 #include "wx/bitmap.h"
 class WXDLLEXPORT wxInputHandler;
 
 #include "wx/bitmap.h"


@@ -104,17 +100,18 @@ public:
     virtual void Release();
     virtual void Click();
 
     virtual void Release();
     virtual void Click();
 

-protected:

     virtual bool PerformAction(const wxControlAction& action,
                                long numArg = -1,
                                const wxString& strArg = wxEmptyString);
     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 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();
 
     // common part of all ctors
     void Init();