applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 6c911828e9131e926b974641a497f46d2bf9b080..cd0880a81fa70fb715da9e4ea68074c64b103c20 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -12,7 +12,7 @@
 #ifndef _WX_COMBOBOX_H_
 #define _WX_COMBOBOX_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "combobox.h"
 #endif
 
@@ -20,16 +20,12 @@
 
 #if wxUSE_COMBOBOX
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
-
 // ----------------------------------------------------------------------------
 // Combobox control
 // ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxComboBox: public wxChoice
 {
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-
 public:
     wxComboBox() { }
 
@@ -44,6 +40,17 @@ public:
     {
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
+    wxComboBox(wxWindow *parent, wxWindowID id,
+            const wxString& value,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style = 0,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxComboBoxNameStr)
+    {
+        Create(parent, id, value, pos, size, choices, style, validator, name);
+    }
 
     bool Create(wxWindow *parent,
                 wxWindowID id,
@@ -55,6 +62,15 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxComboBoxNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString& value,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);
 
     // List functions: see wxChoice
 
@@ -79,10 +95,18 @@ public:
     // implementation only from now on
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
             WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     WXHWND GetEditHWND() const;
+
+protected:
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox)
 };
 
 #endif // wxUSE_COMBOBOX