Reworked the undef stuff a little

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 355d08728114cc9ea220935c78e18e8aff08e15d..a9910b78a31334822f3eba98a54824c156943d56 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -3,8 +3,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,12 +13,12 @@
 #define __GTKCOMBOBOXH__
 
 #ifdef __GNUG__
-#pragma interface
+#pragma interface "combobox.h"
 #endif
 
 #include "wx/defs.h"
+
 #include "wx/object.h"
-#include "wx/list.h"
 #include "wx/control.h"
 
 //-----------------------------------------------------------------------------
@@ -27,8 +27,102 @@
 
 class wxComboBox;
 
+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+extern const char* wxComboBoxNameStr;
+extern const wxChar* wxEmptyString;
+
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
-#endif // __GTKCOMBOBOXH__
+class wxComboBox : public wxControl
+{
+  DECLARE_DYNAMIC_CLASS(wxComboBox)
+
+public:
+
+  inline wxComboBox() {}
+  inline wxComboBox(wxWindow *parent, wxWindowID id,
+           const wxString& value = wxEmptyString,
+           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 = wxComboBoxNameStr)
+  {
+    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,
+           const wxSize& size = wxDefaultSize,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxComboBoxNameStr);
+
+  void Append( const wxString &item );
+  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 );
+  int GetSelection() const;
+  wxString GetString( int n ) const;
+  wxString GetStringSelection() const;
+  int Number() const;
+  void SetSelection( int n );
+  void SetStringSelection( const wxString &string );
+
+  wxString GetValue() const;
+  void SetValue(const wxString& value);
+
+  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 OnSize( wxSizeEvent &event );
+  void OnChar( wxKeyEvent &event );
+  
+// implementation
+    
+  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__