Applied patch [ 619705 ] Fixes wxApp::GetComCtl32Version

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 4fda5e81b8c79176d0422c4be93883a8c137c2dd..84e9e2be49ebc034b47df450bf0195c4518c9c4a 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;
 
 //-----------------------------------------------------------------------------


@@ -42,12 +42,9 @@ extern const wxChar* wxEmptyString;
 
 class wxComboBox : public wxControl
 {
 
 class wxComboBox : public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxComboBox)
-

 public:
 public:

-
-  inline wxComboBox() {}
-  inline wxComboBox(wxWindow *parent, wxWindowID id,
+    inline wxComboBox() {}
+    inline 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,


@@ -55,11 +52,11 @@ public:
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)

-  {
-    Create(parent, id, value, pos, size, n, choices, style, validator, name);
-  }
-  ~wxComboBox();
-  bool Create(wxWindow *parent, wxWindowID id,
+    {
+        Create(parent, id, value, pos, size, n, choices, style, validator, name);
+    }
+    ~wxComboBox();
+    bool Create(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,


@@ -68,63 +65,78 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-  void Append( const wxString &item );
-  void Append( const wxString &item, void* clientData );
-  void Append( const wxString &item, wxClientData* clientData );
+    void Append( const wxString &item );
+    void Append( const wxString &item, void* clientData );
+    void Append( const wxString &item, wxClientData* clientData );

   
   

-  void SetClientData( int n, void* clientData );
-  void* GetClientData( int n );
-  void SetClientObject( int n, wxClientData* clientData );
-  wxClientData* GetClientObject( int n );
+    void Insert( const wxString &item, int pos );
+    void Insert( const wxString &item, int pos, void* clientData );
+    void Insert( const wxString &item, int pos, wxClientData* clientData );

   
   

-  void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
-  wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
-  void SetClientData( void *data )            { wxControl::SetClientData( data ); }
-  void *GetClientData() const                 { return wxControl::GetClientData(); }
-    
-  void Clear();
-  void Delete( int n );
+    void SetClientData( int n, void* clientData );
+    void* GetClientData( int n );
+    void SetClientObject( int n, wxClientData* clientData );
+    wxClientData* GetClientObject( int n );

   
   

-  int FindString( const wxString &item );
-  int GetSelection() const;
-  wxString GetString( int n ) const;
-  wxString GetStringSelection() const;
-  int Number() const;
-  void SetSelection( int n );
-  void SetStringSelection( const wxString &string );
-
-  wxString GetValue() const;
-  void SetValue(const wxString& value);
-
-  void Copy();
-  void Cut();
-  void Paste();
-  void SetInsertionPoint( long pos );
-  void SetInsertionPointEnd();
-  long GetInsertionPoint() const;
-  long GetLastPosition() const;
-  void Replace( long from, long to, const wxString& value );
-  void Remove( long from, long to );
-  void SetSelection( long from, long to );
-  void SetEditable( bool editable );
+    void SetClientObject( wxClientData *data )  { wxControl::SetClientObject( data ); }
+    wxClientData *GetClientObject() const       { return wxControl::GetClientObject(); }
+    void SetClientData( void *data )            { wxControl::SetClientData( data ); }
+    void *GetClientData() const                 { return wxControl::GetClientData(); }
+    
+    void Clear();
+    void Delete( int n );

   
   

-  void OnSize( wxSizeEvent &event );
-  void OnChar( wxKeyEvent &event );
+    int FindString( const wxString &item );
+    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 );
+    void SetString(int n, const wxString &text);
+
+    wxString GetValue() const;
+    void SetValue(const wxString& value);
+
+    void Copy();
+    void Cut();
+    void Paste();
+    void SetInsertionPoint( long pos );
+    void SetInsertionPointEnd();
+    long GetInsertionPoint() const;
+    long GetLastPosition() const;
+    void Replace( long from, long to, const wxString& value );
+    void Remove( long from, long to );
+    void SetSelection( long from, long to );
+    void SetEditable( bool editable );

   
   

-// implementation
+    // implementation
+    
+    virtual void SetFocus();

     
     

-  bool     m_alreadySent;
-  wxList   m_clientDataList;
-  wxList   m_clientObjectList;
-
-  void DisableEvents();
-  void EnableEvents();
-  void AppendCommon( const wxString &item );
-  GtkWidget* GetConnectWidget();
-  bool IsOwnGtkWindow( GdkWindow *window );
-  void ApplyWidgetStyle();
+    void OnSize( wxSizeEvent &event );
+    void OnChar( wxKeyEvent &event );

   
   

-  DECLARE_EVENT_TABLE()
+    bool     m_alreadySent;
+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+    int      m_prevSelection;
+
+    void DisableEvents();
+    void EnableEvents();
+    void AppendCommon( const wxString &item );
+    void InsertCommon( const wxString &item, int pos );
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+ 
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private: 
+    DECLARE_DYNAMIC_CLASS(wxComboBox)
+    DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif