override OnAssertFailure(), not OnAssert() which is not called by wxOnAssert() any...

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

diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h
index c675e37c67d697fc38cfbef1acfdce960bcb5868..44fe29ddbf2c336b1d5a536dc640d0830a341637 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"


@@ -40,7 +36,7 @@ public:
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxBitmap& bitmap,
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxBitmap& bitmap,

-             const wxString& label,
+             const wxString& label = wxEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,


@@ -51,10 +47,10 @@ public:
 
         Create(parent, id, bitmap, label, pos, size, style, validator, name);
     }
 
         Create(parent, id, bitmap, label, pos, size, style, validator, name);
     }

-
+    

     wxButton(wxWindow *parent,
              wxWindowID id,
     wxButton(wxWindow *parent,
              wxWindowID id,

-             const wxString& label,
+             const wxString& label = wxEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,


@@ -68,7 +64,7 @@ public:
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,

-                const wxString& label,
+                const wxString& label = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -78,11 +74,11 @@ public:
         return Create(parent, id, wxNullBitmap, label,
                       pos, size, style, validator, name);
     }
         return Create(parent, id, wxNullBitmap, label,
                       pos, size, style, validator, name);
     }

-
+    

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxBitmap& bitmap,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxBitmap& bitmap,

-                const wxString& label,
+                const wxString& label = wxEmptyString,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,


@@ -99,22 +95,23 @@ public:
     virtual bool IsDefault() const { return m_isDefault; }
 
     // wxButton actions
     virtual bool IsDefault() const { return m_isDefault; }
 
     // wxButton actions

-    void Toggle();
+    virtual void Toggle();

     virtual void Press();
     virtual void Release();
     virtual void Click();
 
     virtual void Press();
     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();