Add wxPanel::SetBackgroundBitmap().

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

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index cae14068b8f8e99de774a45cdaed75177251fe01..d8e5c186e4442bb69d625527c05a63348ba0d3b3 100644 (file)
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -16,8 +16,6 @@
 #include "wx/choice.h"
 #include "wx/textctrl.h"
 
 #include "wx/choice.h"
 #include "wx/textctrl.h"
 

-WXDLLIMPEXP_DATA_CORE(extern const char) wxComboBoxNameStr[];
-

 WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ;
 
 // forward declaration of private implementation classes
 WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ;
 
 // forward declaration of private implementation classes


@@ -100,7 +98,7 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual void SetString(unsigned int n, const wxString& s);
 
     virtual unsigned int GetCount() const;
     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
 // these methods are provided by wxTextEntry for the native impl.
 #if wxOSX_USE_CARBON
     // Text field functions


@@ -132,7 +130,9 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
     virtual bool CanRedo() const;
 
     virtual wxClientDataType GetClientDataType() const;
     virtual bool CanRedo() const;
 
     virtual wxClientDataType GetClientDataType() const;

-#endif
+
+    virtual wxTextWidgetImpl* GetTextPeer() const;
+#endif // wxOSX_USE_CARBON

 
 
 
 
 
 


@@ -163,9 +163,9 @@ protected:
 #endif
     virtual wxWindow *GetEditableWindow() { return this; }
 
 #endif
     virtual wxWindow *GetEditableWindow() { return this; }
 

-#if wxOSX_USE_CARBON

     // override the base class virtuals involved in geometry calculations
     virtual wxSize DoGetBestSize() const;
     // 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
 
     virtual void DoMoveWindow(int x, int y, int width, int height);
 #endif