When wxPGProperty is un-attached from wxPropertyGrid, keep its 'default' cell referen...

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

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index bf1b20861bf7a8d6367c315cdf8b3c01f87a471d..487f9a6c67d5ffa55a4b0c9c8cfc614f2755e2db 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -100,7 +100,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual void SetString(unsigned int n, const wxString& s);
 
     virtual unsigned int GetCount() const;
-    
+
 // these methods are provided by wxTextEntry for the native impl.
 #if wxOSX_USE_CARBON
     // Text field functions
@@ -132,7 +132,9 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanRedo() const;
 
     virtual wxClientDataType GetClientDataType() const;
-#endif
+
+    virtual wxTextWidgetImpl* GetTextPeer() const;
+#endif // wxOSX_USE_CARBON
 
 
 
@@ -146,10 +148,6 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     WX_DECLARE_CONTROL_CONTAINER();
 #endif
 
-    // only used by the native Cocoa combobox, but we must define it everywhere
-    // to maintain the wxTextEntry abstraction.
-    virtual wxTextWidgetImpl * GetTextPeer() const;
-
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;
 #endif
@@ -167,9 +165,9 @@ protected:
 #endif
     virtual wxWindow *GetEditableWindow() { return this; }
 
-#if wxOSX_USE_CARBON
     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
+#if wxOSX_USE_CARBON
     virtual void DoMoveWindow(int x, int y, int width, int height);
 #endif