destroy m_impl even if an exception is thrown from the main loop

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

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


@@ -36,29 +32,39 @@ class WXDLLEXPORT wxInputHandler;
 class WXDLLEXPORT wxButton : public wxButtonBase
 {
 public:
 class WXDLLEXPORT wxButton : public wxButtonBase
 {
 public:

-    wxButton();
+    wxButton() { Init(); }

     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 wxValidator& validator = wxDefaultValidator,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,

-             const wxString& name = wxButtonNameStr);
+             const wxString& name = wxButtonNameStr)
+    {
+        Init();
+
+        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 wxValidator& validator = wxDefaultValidator,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,

-             const wxString& name = wxButtonNameStr);
+             const wxString& name = wxButtonNameStr)
+    {
+        Init();
+
+        Create(parent, id, label, pos, size, style, validator, name);
+    }

 
     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,


@@ -72,7 +78,7 @@ public:
     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,


@@ -89,22 +95,30 @@ 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; }
+
+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+
+
+protected:

     virtual wxSize DoGetBestClientSize() const;
     virtual wxSize DoGetBestClientSize() const;

-    
+

     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 
     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();
 


@@ -121,31 +135,5 @@ private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdButtonInputHandler: translates SPACE and ENTER keys and the left mouse
-// click into button press/release actions
-// ----------------------------------------------------------------------------
-
-class WXDLLEXPORT wxStdButtonInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdButtonInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-
-private:
-    // the window (button) which has capture or NULL and the flag telling if
-    // the mouse is inside the button which captured it or not
-    wxWindow *m_winCapture;
-    bool      m_winHasMouse;
-};
-

 #endif // _WX_UNIV_BUTTON_H_
 
 #endif // _WX_UNIV_BUTTON_H_