add wxDataViewIconText

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index be213a3a230a322cd6bbe5ebedf3b08bbee1fff3..f77165b9757f55104f8ec4f5273fe698cef75e26 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/gtk/combobox.h

 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97


@@ -8,27 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // 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 WXDLLIMPEXP_CORE const wxChar* wxComboBoxNameStr;
-extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
+#ifndef _WX_GTK_COMBOBOX_H_
+#define _WX_GTK_COMBOBOX_H_

 
 //-----------------------------------------------------------------------------
 // wxComboBox
 
 //-----------------------------------------------------------------------------
 // wxComboBox


@@ -37,7 +18,7 @@ extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString;
 class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
 {
 public:
 class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase
 {
 public:

-    inline wxComboBox() {}
+    inline wxComboBox() { m_strings = NULL; }

     inline wxComboBox(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
     inline wxComboBox(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,


@@ -61,7 +42,7 @@ public:
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 
         Create(parent, id, value, pos, size, choices, style, validator, name);
     }
 

-    ~wxComboBox();
+    virtual ~wxComboBox();

 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
 
     bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,


@@ -80,46 +61,47 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 

-    void Clear();
-    void Delete( int n );
-
-    virtual int FindString( const wxString &item ) 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;
+    // 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;
+    virtual void SetSelection(int n);
+    virtual int GetSelection() const;
+    wxString GetStringSelection() const; // not a virtual in parent class
+
+    // From wxItemContainer:
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(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;
     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
 
     // implementation

+    bool HasSelection() const;
+    void GetSelection( long* from, long* to ) const;
+    int GetCurrentSelection() const;

 
     virtual void SetFocus();
 
 
     virtual void SetFocus();
 


@@ -143,16 +125,13 @@ public:
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 
     void OnUpdateDelete(wxUpdateUIEvent& event);
     void OnUpdateSelectAll(wxUpdateUIEvent& event);
 

-    bool     m_ignoreNextUpdate:1;
-    wxList   m_clientDataList;
-    wxList   m_clientObjectList;
-    int      m_prevSelection;
+    bool           m_ignoreNextUpdate:1;
+    wxArrayPtrVoid m_clientData;
+    int            m_prevSelection;

 
     void DisableEvents();
     void EnableEvents();
     GtkWidget* GetConnectWidget();
 
     void DisableEvents();
     void EnableEvents();
     GtkWidget* GetConnectWidget();

-    bool IsOwnGtkWindow( GdkWindow *window );
-    void DoApplyWidgetStyle(GtkRcStyle *style);

 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 
 
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
 


@@ -160,14 +139,19 @@ public:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 protected:
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
 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;
-
+    // From wxWindowGTK:
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
+
+    // From wxItemContainer:
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+    virtual void DoSetItemClientData(unsigned int n, void* clientData);
+    virtual void* DoGetItemClientData(unsigned int n) const;
+    virtual bool IsSorted() const { return HasFlag(wxCB_SORT); }
+
+    // From wxControl:

     virtual wxSize DoGetBestSize() const;
 
     // Widgets that use the style->base colour for the BG colour should
     virtual wxSize DoGetBestSize() const;
 
     // Widgets that use the style->base colour for the BG colour should


@@ -175,12 +159,12 @@ protected:
     virtual bool UseGTKStyleBase() const { return true; }
 
 private:
     virtual bool UseGTKStyleBase() const { return true; }
 
 private:

+    // this array is only used for controls with wxCB_SORT style, so only
+    // allocate it if it's needed (hence using pointer)
+    wxSortedArrayString *m_strings;
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
     DECLARE_EVENT_TABLE()
 };
 

-#endif
-
-#endif
-
-  // __GTKCOMBOBOXH__
+#endif // _WX_GTK_COMBOBOX_H_