Updates to memcheck

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 28a906f941f81cbe8720ccb486ed56faff0ca5fd..c7d7b7064bcd59f92a585d3062e4bcd60aed18bf 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/combobox.h
@@ -48,22 +48,22 @@ class wxComboBox: public wxControl
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            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,
            long style = 0,

+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxComboBoxNameStr)
   {
            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,
   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,
            long style = 0,

+           const wxValidator& validator = wxDefaultValidator,

            const wxString& name = wxComboBoxNameStr);
 
            const wxString& name = wxComboBoxNameStr);
 

-  // List functions

   void Clear(void);
   void Append( const wxString &item );
   void Append( const wxString &item, char* clientData );
   void Clear(void);
   void Append( const wxString &item );
   void Append( const wxString &item, char* clientData );


@@ -76,12 +76,11 @@ class wxComboBox: public wxControl
   wxString GetStringSelection(void) const;
   int Number(void) const;
   void SetSelection( int n );
   wxString GetStringSelection(void) const;
   int Number(void) const;
   void SetSelection( int n );

+  void SetStringSelection( const wxString &string );

 
 

-  // Text field functions

   wxString GetValue(void) const ;
   void SetValue(const wxString& value);
 
   wxString GetValue(void) const ;
   void SetValue(const wxString& value);
 

-  // Clipboard operations

   void Copy(void);
   void Cut(void);
   void Paste(void);
   void Copy(void);
   void Cut(void);
   void Paste(void);


@@ -93,11 +92,22 @@ class wxComboBox: public wxControl
   void Remove(long from, long to);
   void SetSelection(long from, long to);
   void SetEditable(bool editable);
   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 );
+  
+  // implementation

 
 

+    bool     m_alreadySent;
+    

   private:
   
   private:
   

-  wxList m_clientData;
-   
+    wxList   m_clientData;
+
+  GtkWidget* GetConnectWidget(void);
+  bool IsOwnGtkWindow( GdkWindow *window );
+  
+  DECLARE_EVENT_TABLE()

 };
 
 #endif // __GTKCOMBOBOXH__
 };
 
 #endif // __GTKCOMBOBOXH__