fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / ribbon / control.h

diff --git a/include/wx/ribbon/control.h b/include/wx/ribbon/control.h
index e1066a615c4caebe3c36d9d667197248898b80e0..7edb02d2f2729ad348999e81a36cebcab05c0ba2 100644 (file)
--- a/include/wx/ribbon/control.h
+++ b/include/wx/ribbon/control.h
@@ -24,13 +24,24 @@ class wxRibbonArtProvider;
 class WXDLLIMPEXP_RIBBON wxRibbonControl : public wxControl
 {
 public:
 class WXDLLIMPEXP_RIBBON wxRibbonControl : public wxControl
 {
 public:

-    wxRibbonControl() { m_art = NULL; }
+    wxRibbonControl() { Init(); }

 
     wxRibbonControl(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
 
     wxRibbonControl(wxWindow *parent, wxWindowID id,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,

-                    const wxString& name = wxControlNameStr);
+                    const wxString& name = wxControlNameStr)
+    {
+        Init();
+
+        Create(parent, id, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxControlNameStr);

 
     virtual void SetArtProvider(wxRibbonArtProvider* art);
     wxRibbonArtProvider* GetArtProvider() const {return m_art;}
 
     virtual void SetArtProvider(wxRibbonArtProvider* art);
     wxRibbonArtProvider* GetArtProvider() const {return m_art;}


@@ -52,6 +63,9 @@ protected:
     virtual wxSize DoGetNextLargerSize(wxOrientation direction,
                                        wxSize relative_to) const;
 
     virtual wxSize DoGetNextLargerSize(wxOrientation direction,
                                        wxSize relative_to) const;
 

+private:
+    void Init() { m_art = NULL; }
+

 #ifndef SWIG
     DECLARE_CLASS(wxRibbonControl)
 #endif
 #ifndef SWIG
     DECLARE_CLASS(wxRibbonControl)
 #endif