Added GetRect to region iterator; cured window.cpp problem for BC++

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

diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index 55ba995672fe74967761274651049463b481536a..ea621e0697b25fbde1e02ebc254d9d95b7d5bcd4 100644 (file)
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -2,9 +2,8 @@
 // Name:        listbox.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -26,6 +25,7 @@
 //-----------------------------------------------------------------------------
 
 class wxListBox;
+class wxArrayInt;
 
 //-----------------------------------------------------------------------------
 // global data
@@ -44,14 +44,23 @@ class wxListBox: public wxControl
   public:
 
     wxListBox(void);
-    wxListBox( wxWindow *parent, wxWindowID id, 
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, const wxString &name = wxListBoxNameStr );
+    inline wxListBox( wxWindow *parent, wxWindowID id,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxListBoxNameStr )
+    {
+      Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
     bool Create( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      int n = 0, const wxString choices[] = NULL,
-      long style = 0, const wxString &name = wxListBoxNameStr );
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxListBoxNameStr );
     void Append( const wxString &item );
     void Append( const wxString &item, char *clientData );
     void Clear(void);
@@ -72,14 +81,19 @@ class wxListBox: public wxControl
     void SetSelection( int n, bool select = TRUE );
     void SetString( int n, const wxString &string );
     void SetStringSelection( const wxString &string, bool select = TRUE );
+    
+    void SetDropTarget( wxDropTarget *dropTarget );
 
-  private:
-  
-    GtkList   *m_list;
+  // implementation
     
-  public:
-  
     int GetIndex( GtkWidget *item ) const;
+    GtkWidget *GetConnectWidget(void);
+    bool IsOwnGtkWindow( GdkWindow *window );
+    void ApplyWidgetStyle();
+    
+    GtkList   *m_list;
+    wxList     m_clientData;
+    
 };
 
 #endif // __GTKLISTBOXH__