Some #include and #if wxUSE_XX things

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index 654ae70bfe3424d33211b11599912bde1cda4479..d1787f8ca02cf8b2437df27dd0d21f78402ce3d8 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -17,6 +17,9 @@
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_COMBOBOX
+
 #include "wx/object.h"
 #include "wx/control.h"
 
@@ -31,19 +34,19 @@ class wxComboBox;
 //-----------------------------------------------------------------------------
 
 extern const char* wxComboBoxNameStr;
-extern const char* wxEmptyString;
+extern const wxChar* wxEmptyString;
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-class wxComboBox: public wxControl
+class wxComboBox : public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxComboBox)
 
- public:
-  inline wxComboBox(void) {}
+public:
 
+  inline wxComboBox() {}
   inline wxComboBox(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
@@ -55,6 +58,7 @@ class wxComboBox: public wxControl
   {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
   }
+  ~wxComboBox();
   bool Create(wxWindow *parent, wxWindowID id,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
@@ -64,45 +68,65 @@ class wxComboBox: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxComboBoxNameStr);
 
-  void Clear(void);
   void Append( const wxString &item );
-  void Append( const wxString &item, char* clientData );
+  void Append( const wxString &item, void* clientData );
+  void Append( const wxString &item, wxClientData* clientData );
+  
+  void SetClientData( int n, void* clientData );
+  void* GetClientData( int n );
+  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 );
+  
   int FindString( const wxString &item );
-  char* GetClientData( int n );
-  void SetClientData( int n, char * clientData );
-  int GetSelection(void) const;
+  int GetSelection() const;
   wxString GetString( int n ) const;
-  wxString GetStringSelection(void) const;
-  int Number(void) const;
+  wxString GetStringSelection() const;
+  int Number() const;
   void SetSelection( int n );
   void SetStringSelection( const wxString &string );
 
-  wxString GetValue(void) const ;
+  wxString GetValue() const;
   void SetValue(const wxString& value);
 
-  void Copy(void);
-  void Cut(void);
-  void Paste(void);
-  void SetInsertionPoint(long pos);
-  void SetInsertionPointEnd(void);
-  long GetInsertionPoint(void) const ;
-  long GetLastPosition(void) const ;
-  void Replace(long from, long to, const wxString& value);
-  void Remove(long from, long to);
-  void SetSelection(long from, long to);
-  void SetEditable(bool editable);
+  void Copy();
+  void Cut();
+  void Paste();
+  void SetInsertionPoint( long pos );
+  void SetInsertionPointEnd();
+  long GetInsertionPoint() const;
+  long GetLastPosition() const;
+  void Replace( long from, long to, const wxString& value );
+  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 OnChar( wxKeyEvent &event );
   
-  // implementation
-
-    bool     m_alreadySent;
+// implementation
     
-  private:
-  
-    wxList   m_clientData;
+  bool     m_alreadySent;
+  wxList   m_clientDataList;
+  wxList   m_clientObjectList;
+
+  void AppendCommon( const wxString &item );
+  GtkWidget* GetConnectWidget();
+  bool IsOwnGtkWindow( GdkWindow *window );
+  void ApplyWidgetStyle();
   
+  DECLARE_EVENT_TABLE()
 };
 
-#endif // __GTKCOMBOBOXH__
+#endif
+
+#endif
+
+  // __GTKCOMBOBOXH__