X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f02a879ed7efc5fcf6328ff47a1352ec82812b7..ad667945478cda0c0a33e154f1d4403402cffb9e:/include/wx/gtk/combobox.h

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 357a476a39..f8540a2bd8 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -8,27 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKCOMBOBOXH__
-#define __GTKCOMBOBOXH__
-
-#include "wx/defs.h"
-
-#if wxUSE_COMBOBOX
-
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxComboBox;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLEXPORT_DATA(const wxChar) wxComboBoxNameStr[];
-extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
+#ifndef _WX_GTK_COMBOBOX_H_
+#define _WX_GTK_COMBOBOX_H_
 
 //-----------------------------------------------------------------------------
 // wxComboBox
@@ -61,7 +42,7 @@ public:
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
-    ~wxComboBox();
+    virtual ~wxComboBox();
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
@@ -80,46 +61,47 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
-    void Clear();
-    void Delete( int n );
-
+    // From wxItemContainerImmutable:
+    virtual unsigned int GetCount() const;
+    virtual wxString GetString(unsigned int n) const;
+    virtual void SetString(unsigned int n, const wxString &text);
     virtual int FindString(const wxString& s, bool bCase = false) const;
-    int GetSelection() const;
-    int GetCurrentSelection() const;
-    wxString GetString( int n ) const;
-    wxString GetStringSelection() const;
-    int GetCount() const;
-    int Number() const { return GetCount(); }
-    void SetSelection( int n );
-    void SetString(int n, const wxString &text);
-
-    wxString GetValue() const;
-    void SetValue(const wxString& value);
-
-    void Copy();
-    void Cut();
-    void Paste();
-    bool CanCopy() const;
-    bool CanCut() const;
-    bool CanPaste() const;
-    void SetInsertionPoint( long pos );
-    void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
-    long GetInsertionPoint() const;
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+    wxString GetStringSelection() const; // not a virtual in parent class
+
+    // From wxItemContainer:
+    virtual void Clear();
+    virtual void Delete(unsigned int n);
+
+    // From wxBomboBoxBase:
+    virtual wxString GetValue() const;
+    virtual void SetValue(const wxString& value);
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+    virtual void SetInsertionPoint( long pos );
+    virtual long GetInsertionPoint() const;
     virtual wxTextPos 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 GetSelection( long* from, long* to ) const;
-    void SetEditable( bool editable );
-    void Undo() ;
-    void Redo() ;
-    bool CanUndo() const;
-    bool CanRedo() const;
-    void SelectAll();
-    bool IsEditable() const ;
-    bool HasSelection() const ;
+    virtual void Replace( long from, long to, const wxString& value );
+    virtual void SetSelection( long from, long to );
+    virtual void SetEditable( bool editable );
+    virtual void SetInsertionPointEnd() { SetInsertionPoint( -1 ); }
+    virtual void Remove(long from, long to) { Replace(from, to, wxEmptyString); }
+    virtual bool IsEditable() const;
+    virtual void Undo();
+    virtual void Redo();
+    virtual void SelectAll();
+    virtual bool CanCopy() const;
+    virtual bool CanCut() const;
+    virtual bool CanPaste() const;
+    virtual bool CanUndo() const;
+    virtual bool CanRedo() const;
 
     // implementation
+    bool HasSelection() const;
+    void GetSelection( long* from, long* to ) const;
+    int GetCurrentSelection() const;
 
     virtual void SetFocus();
 
@@ -151,7 +133,6 @@ public:
     void DisableEvents();
     void EnableEvents();
     GtkWidget* GetConnectWidget();
-    bool IsOwnGtkWindow( GdkWindow *window );
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
@@ -159,15 +140,20 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    // From wxWindowGTK:
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
+    // From wxItemContainer:
     virtual int DoAppend(const wxString& item);
-    virtual int DoInsert(const wxString& item, int pos);
+    virtual int DoInsert(const wxString& item, unsigned 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 void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
+    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
 
+    // From wxControl:
     virtual wxSize DoGetBestSize() const;
 
     // Widgets that use the style->base colour for the BG colour should
@@ -179,8 +165,4 @@ private:
     DECLARE_EVENT_TABLE()
 };
 
-#endif
-
-#endif
-
-  // __GTKCOMBOBOXH__
+#endif // _WX_GTK_COMBOBOX_H_