Fix wxComboBox constructors after keyboard access commit, not all constructors were...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/carbon/combobox.h b/include/wx/mac/carbon/combobox.h
index 45b4f96b4e8a8c0250efdf15dd9054d991ed4d53..6c7d4a5c85c262ebce614f6021b04119f2d3f815 100644 (file)
--- a/include/wx/mac/carbon/combobox.h
+++ b/include/wx/mac/carbon/combobox.h
@@ -28,7 +28,6 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
  public:
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
  public:

-    wxComboBox() ;

     virtual ~wxComboBox();
 
     // forward these functions to all subcontrols
     virtual ~wxComboBox();
 
     // forward these functions to all subcontrols


@@ -39,7 +38,9 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
     virtual void DelegateTextChanged( const wxString& value );
     virtual void DelegateChoice( const wxString& value );
 
     virtual void DelegateTextChanged( const wxString& value );
     virtual void DelegateChoice( const wxString& value );
 

-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+    wxComboBox() { Init(); }
+
+    wxComboBox(wxWindow *parent, wxWindowID id,

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -48,9 +49,11 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {

-    Create(parent, id, value, pos, size, n, choices, style, validator, name);
+        Init();
+        Create(parent, id, value, pos, size, n, choices, style, validator, name);

     }
     }

-    inline wxComboBox(wxWindow *parent, wxWindowID id,
+    
+    wxComboBox(wxWindow *parent, wxWindowID id,

            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,
            const wxString& value,
            const wxPoint& pos,
            const wxSize& size,


@@ -59,7 +62,8 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
     {

-    Create(parent, id, value, pos, size, choices, style, validator, name);
+        Init();
+        Create(parent, id, value, pos, size, choices, style, validator, name);

     }
 
     bool Create(wxWindow *parent, wxWindowID id,
     }
 
     bool Create(wxWindow *parent, wxWindowID id,


@@ -70,6 +74,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);

+

     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value,
            const wxPoint& pos,


@@ -131,6 +136,9 @@ protected:
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 

+    // common part of all ctors
+    void Init();
+

     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;
 
     virtual int DoAppend(const wxString& item) ;
     virtual int DoInsert(const wxString& item, int pos) ;
 

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index a1fbf3c01fc7f6eb0a7e4426ab9d7ebb4fb9c0f7..56238d61d6dcb71cd0aa43f685ef6838f3409913 100644 (file)
--- a/src/mac/carbon/combobox.cpp
+++ b/src/mac/carbon/combobox.cpp
@@ -226,11 +226,6 @@ BEGIN_EVENT_TABLE(wxComboBoxChoice, wxChoice)
     EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 
     EVT_CHOICE(-1, wxComboBoxChoice::OnChoice)
 END_EVENT_TABLE()
 

-wxComboBox::wxComboBox()
-{
-    m_container.SetContainerWindow(this);
-}
-

 wxComboBox::~wxComboBox()
 {
     // delete client objects
 wxComboBox::~wxComboBox()
 {
     // delete client objects


@@ -335,6 +330,11 @@ void wxComboBox::DelegateChoice( const wxString& value )
     SetStringSelection( value );
 }
 
     SetStringSelection( value );
 }
 

+void wxComboBox::Init()
+{
+    m_container.SetContainerWindow(this);
+}
+

 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,
 bool wxComboBox::Create(wxWindow *parent,
     wxWindowID id,
     const wxString& value,