Fixes for long to wxCoord

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index f1627cf454cf32d0aa9f995cfc4dacbcbd3c83e3..8b477fff3af28d79c1e9bd1699e1d355178e9e08 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -16,6 +16,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_LISTBOX
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -51,7 +54,9 @@ public:
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxListBoxNameStr )
     {
+#if wxUSE_CHECKLISTBOX
         m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     virtual ~wxListBox();
@@ -75,15 +80,20 @@ public:
     void SetClientObject( int n, wxClientData* clientData );
     wxClientData* GetClientObject( int n );
 
+    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 Deselect( int n );
     int FindString( const wxString &item ) const;
-    int GetSelection(void) const;
+    int GetSelection() const;
     int GetSelections( class wxArrayInt &) const;
     wxString GetString( int n ) const;
-    wxString GetStringSelection(void) const;
+    wxString GetStringSelection() const;
     int Number();
     bool Selected( int n );
     void Set( int n, const wxString *choices );
@@ -99,11 +109,14 @@ public:
 
     // implementation
 
+    void DisableEvents();
+    void EnableEvents();
     void AppendCommon( const wxString &item );
     int GetIndex( GtkWidget *item ) const;
     GtkWidget *GetConnectWidget();
     bool IsOwnGtkWindow( GdkWindow *window );
     void ApplyWidgetStyle();
+    void OnInternalIdle();
 
 #if wxUSE_TOOLTIPS
     void ApplyToolTip( GtkTooltips *tips, const wxChar *tip );
@@ -112,7 +125,12 @@ public:
     GtkList   *m_list;
     wxList     m_clientDataList;
     wxList     m_clientObjectList;
+
+#if wxUSE_CHECKLISTBOX
     bool       m_hasCheckBoxes;
+#endif // wxUSE_CHECKLISTBOX
 };
 
+#endif
+
 #endif // __GTKLISTBOXH__