added definition of TARGET_CARBON when compiling with non generated setup.h

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index f48a786405c4e3b4c3c28507386270c04f05ae47..6fc045a70432e4a44816fdc26c5ba20120d19dc8 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -12,7 +12,7 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "combobox.h"
 #endif
 
 #pragma interface "combobox.h"
 #endif
 


@@ -33,7 +33,7 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char* wxComboBoxNameStr;
+extern const wxChar* wxComboBoxNameStr;

 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------


@@ -86,6 +86,7 @@ public:
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;
     int GetSelection() const;
     wxString GetString( int n ) const;
     wxString GetStringSelection() const;

+    int GetCount() const { return Number(); }

     int Number() const;
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );
     int Number() const;
     void SetSelection( int n );
     void SetStringSelection( const wxString &string );


@@ -107,12 +108,15 @@ public:
   
     // implementation
     
   
     // implementation
     

+    virtual void SetFocus();
+    

     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
   
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;
     void OnSize( wxSizeEvent &event );
     void OnChar( wxKeyEvent &event );
   
     bool     m_alreadySent;
     wxList   m_clientDataList;
     wxList   m_clientObjectList;

+    int      m_prevSelection;

 
     void DisableEvents();
     void EnableEvents();
 
     void DisableEvents();
     void EnableEvents();