fixed mysterious mistakes

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

diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index 355d08728114cc9ea220935c78e18e8aff08e15d..1215f6a85db33de395e66e65a768de39399b4f2e 100644 (file)
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97

-// Id:
+// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -13,12 +13,11 @@
 #define __GTKCOMBOBOXH__
 
 #ifdef __GNUG__
 #define __GTKCOMBOBOXH__
 
 #ifdef __GNUG__

-#pragma interface
+#pragma interface "combobox.h"

 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/object.h"

-#include "wx/list.h"

 #include "wx/control.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/control.h"
 
 //-----------------------------------------------------------------------------


@@ -27,8 +26,82 @@
 
 class wxComboBox;
 
 
 class wxComboBox;
 

+//-----------------------------------------------------------------------------
+// global data
+//-----------------------------------------------------------------------------
+
+extern const char* wxComboBoxNameStr;
+extern const char* wxEmptyString;
+

 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

+class wxComboBox: public wxControl
+{
+  DECLARE_DYNAMIC_CLASS(wxComboBox)
+
+ public:
+  inline wxComboBox(void) {}
+
+  inline wxComboBox(wxWindow *parent, wxWindowID id,
+           const wxString& value = wxEmptyString,
+           const wxPoint& pos = wxDefaultPosition,
+           const wxSize& size = wxDefaultSize,
+           int n = 0, const wxString choices[] = NULL,
+           long style = 0,
+           const wxString& name = wxComboBoxNameStr)
+  {
+    Create(parent, id, value, pos, size, n, choices, style, 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,
+           long style = 0,
+           const wxString& name = wxComboBoxNameStr);
+
+  // List functions
+  void Clear(void);
+  void Append( const wxString &item );
+  void Append( const wxString &item, char* clientData );
+  void Delete( int n );
+  int FindString( const wxString &item );
+  char* GetClientData( int n );
+  void SetClientData( int n, char * clientData );
+  int GetSelection(void) const;
+  wxString GetString( int n ) const;
+  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);
+
+  // Clipboard operations
+  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);
+
+  private:
+  
+    wxList   m_clientData;
+  
+  public:
+  
+    bool     m_alreadySent;
+};
+

 #endif // __GTKCOMBOBOXH__
 #endif // __GTKCOMBOBOXH__