X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c8a980fc412792e64256724e02e9d387ee38e21..31ad423e4fb556ec225a63b161154d3bf3445c1b:/include/wx/gtk1/listbox.h diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h index 10b0107526..b8c980241f 100644 --- a/include/wx/gtk1/listbox.h +++ b/include/wx/gtk1/listbox.h @@ -11,12 +11,14 @@ #ifndef __GTKLISTBOXH__ #define __GTKLISTBOXH__ -#ifdef __GNUG__ -#pragma interface +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) +#pragma interface "listbox.h" #endif #include "wx/list.h" +class WXDLLIMPEXP_BASE wxSortedArrayString; + //----------------------------------------------------------------------------- // wxListBox //----------------------------------------------------------------------------- @@ -39,6 +41,19 @@ public: #endif // wxUSE_CHECKLISTBOX Create(parent, id, pos, size, n, choices, style, validator, name); } + wxListBox( wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr ) + { +#if wxUSE_CHECKLISTBOX + m_hasCheckBoxes = FALSE; +#endif // wxUSE_CHECKLISTBOX + Create(parent, id, pos, size, choices, style, validator, name); + } virtual ~wxListBox(); bool Create(wxWindow *parent, wxWindowID id, @@ -48,6 +63,13 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); + bool Create(wxWindow *parent, wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); // implement base class pure virtuals virtual void Clear(); @@ -74,19 +96,16 @@ public: virtual void DoSetItemClientObject(int n, wxClientData* clientData); virtual wxClientData* DoGetItemClientObject(int n) const; + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); + // implementation from now on -#if wxUSE_DRAG_AND_DROP - void SetDropTarget( wxDropTarget *dropTarget ); -#endif - - void DisableEvents(); - void EnableEvents(); - void AppendWithoutSorting( const wxString &item ); - int GetIndex( GtkWidget *item ) const; + void GtkAddItem( const wxString &item, int pos=-1 ); + int GtkGetIndex( GtkWidget *item ) const; GtkWidget *GetConnectWidget(); bool IsOwnGtkWindow( GdkWindow *window ); - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); void OnInternalIdle(); #if wxUSE_TOOLTIPS @@ -94,12 +113,27 @@ public: #endif // wxUSE_TOOLTIPS GtkList *m_list; - wxList m_clientData; + wxList m_clientList; #if wxUSE_CHECKLISTBOX bool m_hasCheckBoxes; #endif // wxUSE_CHECKLISTBOX + int m_prevSelection; + bool m_blockEvent; + + virtual void FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y); + +protected: + virtual wxSize DoGetBestSize() const; + + // return the string label for the given item + wxString GetRealLabel(struct _GList *item) const; + + // Widgets that use the style->base colour for the BG colour should + // override this and return true. + 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)