1. wxTimer::Start() returns bool in wxGTK too (other minor corrections

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index d2ea1822c9ea65bcaf3b753b57d78331d7e57ee9..c7d7b7064bcd59f92a585d3062e4bcd60aed18bf 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -48,7 +48,7 @@ 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,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)
            long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr)


@@ -59,12 +59,11 @@ 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,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
            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 );
   void Clear(void);
   void Append( const wxString &item );
   void Append( const wxString &item, char* clientData );


@@ -79,11 +78,9 @@ class wxComboBox: public wxControl
   void SetSelection( int n );
   void SetStringSelection( const wxString &string );
 
   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);


@@ -95,14 +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:
   
     wxList   m_clientData;
   private:
   
     wxList   m_clientData;

+
+  GtkWidget* GetConnectWidget(void);
+  bool IsOwnGtkWindow( GdkWindow *window );

   
   

-  public:
-  
-    bool     m_alreadySent;
+  DECLARE_EVENT_TABLE()

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