Minor modifications...

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 1215f6a85db33de395e66e65a768de39399b4f2e..5b8046a4a55cb09e8894203986b3da3bce5adc71 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Id:          $Id$
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -48,22 +48,22 @@ class wxComboBox: public wxControl
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
            long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
   {
-    Create(parent, id, value, pos, size, n, choices, style, name);
+    Create(parent, id, value, pos, size, n, choices, style, validator, name);
   }
-
   bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
            long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
-  // List functions
   void Clear(void);
   void Append( const wxString &item );
   void Append( const wxString &item, char* clientData );
@@ -78,11 +78,9 @@ class wxComboBox: public wxControl
   void SetSelection( int n );
   void SetStringSelection( const wxString &string );
 
-  // Text field functions
   wxString GetValue(void) const ;
   void SetValue(const wxString& value);
 
-  // Clipboard operations
   void Copy(void);
   void Cut(void);
   void Paste(void);
@@ -94,14 +92,23 @@ class wxComboBox: public wxControl
   void Remove(long from, long to);
   void SetSelection(long from, long to);
   void SetEditable(bool editable);
+  
+  void SetFont( const wxFont &font );
+  void OnSize( wxSizeEvent &event );
+  void SetBackgroundColour( const wxColour &colour );
+  
+  // implementation
 
+    bool     m_alreadySent;
+    
   private:
   
     wxList   m_clientData;
+
+  GtkWidget* GetConnectWidget(void);
+  bool IsOwnGtkWindow( GdkWindow *window );
   
-  public:
-  
-    bool     m_alreadySent;
+  DECLARE_EVENT_TABLE()
 };
 
 #endif // __GTKCOMBOBOXH__