X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac57418f39e9671c18b99942180563146625d3ae..45bbbc54304272eb25b96e6c63b57107991bcd26:/include/wx/gtk1/combobox.h

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index acabf59f7d..54f5d30cf7 100644
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -12,16 +12,15 @@
 #ifndef __GTKCOMBOBOXH__
 #define __GTKCOMBOBOXH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "combobox.h"
 #endif
 
 #include "wx/defs.h"
 
-#ifdef wxUSE_COMBOBOX
+#if wxUSE_COMBOBOX
 
 #include "wx/object.h"
-#include "wx/control.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -33,21 +32,18 @@ class wxComboBox;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char* wxComboBoxNameStr;
-extern const char* wxEmptyString;
+extern const wxChar* wxComboBoxNameStr;
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-class wxComboBox : public wxControl
+class wxComboBox : public wxControl, public wxComboBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxComboBox)
-
 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,
@@ -55,11 +51,13 @@ public:
            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,
@@ -68,61 +66,73 @@ public:
            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 SetClientData( int n, void* clientData );
-  void* GetClientData( int n );
-  void SetClientObject( int n, wxClientData* clientData );
-  wxClientData* GetClientObject( int n );
-  
-  void Clear();
-  void Delete( 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 OnSize( wxSizeEvent &event );
-  
-// implementation
-    
-  bool     m_alreadySent;
-  wxList   m_clientDataList;
-  wxList   m_clientObjectList;
-
-  void AppendCommon( const wxString &item );
-  GtkWidget* GetConnectWidget();
-  bool IsOwnGtkWindow( GdkWindow *window );
-  void ApplyWidgetStyle();
-  
-  DECLARE_EVENT_TABLE()
+    void Clear();
+    void Delete( int n );
+
+    virtual int FindString( const wxString &item ) const;
+    int GetSelection() const;
+    wxString GetString( int n ) const;
+    wxString GetStringSelection() const;
+    int GetCount() const;
+    int Number() const { return GetCount(); }
+    void SetSelection( int n );
+    void Select( int n ) { return SetSelection( 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() { SetInsertionPoint( -1 ); }
+    long GetInsertionPoint() const;
+    long GetLastPosition() const;
+    void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
+    void Replace( long from, long to, const wxString& value );
+    void SetSelection( long from, long to );
+    void SetEditable( bool editable );
+
+    // implementation
+
+    virtual void SetFocus();
+
+    void OnSize( wxSizeEvent &event );
+    void OnChar( wxKeyEvent &event );
+
+    bool     m_alreadySent;
+    wxList   m_clientDataList;
+    wxList   m_clientObjectList;
+    int      m_prevSelection;
+
+    void DisableEvents();
+    void EnableEvents();
+    GtkWidget* GetConnectWidget();
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+
+    wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
+
+protected:
+    virtual int DoAppend(const wxString& item);
+    virtual int DoInsert(const wxString& item, int pos);
+
+    virtual void DoSetItemClientData( int n, void* clientData );
+    virtual void* DoGetItemClientData( int n ) const;
+    virtual void DoSetItemClientObject( int n, wxClientData* clientData );
+    virtual wxClientData* DoGetItemClientObject( int n ) const;
+
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
+    DECLARE_EVENT_TABLE()
 };
 
 #endif
 
-  // wxUSE_COMBOBOX
-
 #endif
 
   // __GTKCOMBOBOXH__