added a call for invalidating the dc setup on mac explicitely (needed in case of...

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

diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 07054af74e7bbd327c86a1bb7e00823299003930..1b8b532805d32f324652253d81dfd2ebd0d99f51 100644 (file)
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -1,23 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        combobox.h
 // Purpose:     wxComboBox class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/13/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
-#pragma interface "combobox.h"
-#endif
-
 #include "wx/choice.h"
 
+#if wxUSE_COMBOBOX
+
 WXDLLEXPORT_DATA(extern const char*) wxComboBoxNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 
@@ -35,7 +33,9 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            const wxSize& size = wxDefaultSize,
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxComboBoxNameStr)
   {
     Create(parent, id, value, pos, size, n, choices, style, validator, name);
@@ -47,38 +47,38 @@ class WXDLLEXPORT wxComboBox: public wxChoice
            const wxSize& size = wxDefaultSize,
            int n = 0, const wxString choices[] = NULL,
            long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxComboBoxNameStr);
 
-  // List functions
-  virtual void Append(const wxString& item);
-  virtual void Delete(int n);
-  virtual void Clear();
-  virtual int GetSelection() const ;
-  virtual void SetSelection(int n);
-  virtual int FindString(const wxString& s) const;
-  virtual wxString GetString(int n) const ;
-  virtual wxString GetStringSelection() const ;
-  virtual bool SetStringSelection(const wxString& sel);
-  virtual inline int Number() const { return m_noStrings; }
-  
-  // Text field functions
-  virtual wxString GetValue() const ;
-  virtual void SetValue(const wxString& value);
+    // List functions: see wxChoice
+
+    wxString GetValue() const { return GetLabel(); }
+    virtual void SetValue(const wxString& value);
+
+    // Clipboard operations
+    virtual void Copy();
+    virtual void Cut();
+    virtual void Paste();
+    virtual void SetInsertionPoint(long pos);
+    virtual void SetInsertionPointEnd();
+    virtual long GetInsertionPoint() const;
+    virtual long GetLastPosition() const;
+    virtual void Replace(long from, long to, const wxString& value);
+    virtual void Remove(long from, long to);
+    virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
+    virtual void SetSelection(long from, long to);
+    virtual void SetEditable(bool editable);
+
+    virtual bool OS2Command(WXUINT param, WXWORD id);
 
-  // Clipboard operations
-  virtual void Copy();
-  virtual void Cut();
-  virtual void Paste();
-  virtual void SetInsertionPoint(long pos);
-  virtual void SetInsertionPointEnd();
-  virtual long GetInsertionPoint() const ;
-  virtual long GetLastPosition() const ;
-  virtual void Replace(long from, long to, const wxString& value);
-  virtual void Remove(long from, long to);
-  virtual void SetSelection(long from, long to);
-  virtual void SetEditable(bool editable);
+protected:
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
 };
 
+#endif // wxUSE_COMBOBOX
 #endif
     // _WX_COMBOBOX_H_