Added a virtual wxWindow::OSXGetViewOrWindow() method.

[wxWidgets.git] / include / wx / osx / combobox.h

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 6e0c649aaa620ed9b3a573cde5732b2e1d19c38c..92ff947afe010df40082324195271728f585b1ef 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -126,8 +126,8 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual wxClientDataType GetClientDataType() const;
 
     // osx specific event handling common for all osx-ports
     virtual wxClientDataType GetClientDataType() const;
 
     // osx specific event handling common for all osx-ports

-    
-    virtual bool        HandleClicked( double timestampsec );
+
+    virtual bool        OSXHandleClicked( double timestampsec );

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 


@@ -141,6 +141,10 @@ protected:
     virtual void DoDeleteOneItem(unsigned int n);
     virtual void DoClear();
 
     virtual void DoDeleteOneItem(unsigned int n);
     virtual void DoClear();
 

+    // wxTextEntry functions
+    virtual wxString DoGetValue() const;
+    virtual wxWindow *GetEditableWindow() { return this; }
+

     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);


@@ -154,6 +158,8 @@ protected:
 
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 
 
     virtual void SetClientDataType(wxClientDataType clientDataItemsType);
 

+    virtual void EnableTextChangedEvents(bool enable);
+

     // the subcontrols
     wxComboBoxText*     m_text;
     wxComboBoxChoice*   m_choice;
     // the subcontrols
     wxComboBoxText*     m_text;
     wxComboBoxChoice*   m_choice;