Added support for frames without borders (such as for

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

diff --git a/include/wx/gtk1/combobox.h b/include/wx/gtk1/combobox.h
index cd4d25d3a49d674a4fe959712fa878370ef258f2..12c632e48020505a1d4f4a01329c8b0934777214 100644 (file)
--- a/include/wx/gtk1/combobox.h
+++ b/include/wx/gtk1/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,7 +13,7 @@
 #define __GTKCOMBOBOXH__
 
 #ifdef __GNUG__
 #define __GTKCOMBOBOXH__
 
 #ifdef __GNUG__

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

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


@@ -44,60 +44,71 @@ class wxComboBox: public wxControl
  public:
   inline wxComboBox(void) {}
 
  public:
   inline wxComboBox(void) {}
 

-  inline wxComboBox(wxWindow *parent, const wxWindowID id,
+  inline wxComboBox(wxWindow *parent, wxWindowID id,

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
+           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, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,
            const wxString& value = wxEmptyString,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,

-           const int n = 0, const wxString choices[] = NULL,
-           const long style = 0,
+           int n = 0, const wxString choices[] = (const wxString *) NULL,
+           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 );

-  void Delete( const int n );
+  void Delete( int n );

   int FindString( const wxString &item );
   int FindString( const wxString &item );

-  char* GetClientData( const int n );
-  void SetClientData( const int n, char * clientData );
+  char* GetClientData( int n );
+  void SetClientData( int n, char * clientData );

   int GetSelection(void) const;
   int GetSelection(void) const;

-  wxString GetString( const int n ) const;
+  wxString GetString( int n ) const;

   wxString GetStringSelection(void) const;
   int Number(void) const;
   wxString GetStringSelection(void) const;
   int Number(void) const;

-  void SetSelection( const int n );
-  
-  // Text field functions
+  void SetSelection( int n );
+  void SetStringSelection( const wxString &string );
+

   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);

-  void SetInsertionPoint(const long pos);
+  void SetInsertionPoint(long pos);

   void SetInsertionPointEnd(void);
   long GetInsertionPoint(void) const ;
   long GetLastPosition(void) const ;
   void SetInsertionPointEnd(void);
   long GetInsertionPoint(void) const ;
   long GetLastPosition(void) const ;

-  void Replace(const long from, const long to, const wxString& value);
-  void Remove(const long from, const long to);
-  void SetSelection(const long from, const long to);
-  void SetEditable(const bool editable);
- 
+  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 SetBackgroundColour( const wxColour &colour );
+  
+  // 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__