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 44fe29ddbf2c336b1d5a536dc640d0830a341637..b9ce26f632f0ed5fd6b89ccad5c4c4cc18122100 100644 (file)
--- a/include/wx/univ/button.h
+++ b/include/wx/univ/button.h
@@ -47,7 +47,7 @@ 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,
              const wxString& label = wxEmptyString,
     wxButton(wxWindow *parent,
              wxWindowID id,
              const wxString& label = wxEmptyString,


@@ -74,7 +74,7 @@ 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,


@@ -106,9 +106,16 @@ public:
 
     virtual bool CanBeHighlighted() const { return true; }
 
 
     virtual bool CanBeHighlighted() const { return true; }
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+
+

 protected:
     virtual wxSize DoGetBestClientSize() const;
 protected:
     virtual wxSize DoGetBestClientSize() const;

-    
+

     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 
     virtual bool DoDrawBackground(wxDC& dc);
     virtual void DoDraw(wxControlRenderer *renderer);
 


@@ -128,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_