Compile in IFF stuff.

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

diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index 1828e0045a9fc1d0c861b065ddac36dfc0ae6c4e..6c911828e9131e926b974641a497f46d2bf9b080 100644 (file)
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combobox.h
+// Name:        wx/msw/combobox.h

 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxComboBox class
 // Author:      Julian Smart
 // Modified by:


@@ -20,7 +20,6 @@
 
 #if wxUSE_COMBOBOX
 
 
 #if wxUSE_COMBOBOX
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxComboBoxNameStr;

 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // ----------------------------------------------------------------------------
 WXDLLEXPORT_DATA(extern const wxChar*) wxEmptyString;
 
 // ----------------------------------------------------------------------------


@@ -46,14 +45,16 @@ public:
         Create(parent, id, value, pos, size, n, choices, style, validator, name);
     }
 
         Create(parent, id, value, pos, size, n, choices, style, validator, 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 wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxComboBoxNameStr);
+    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 wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxComboBoxNameStr);

 
     // List functions: see wxChoice
 
 
     // List functions: see wxChoice
 


@@ -75,11 +76,13 @@ public:
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 
     virtual void SetSelection(long from, long to);
     virtual void SetEditable(bool editable);
 

+    // implementation only from now on

     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool MSWCommand(WXUINT param, WXWORD id);

+    bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
 

-protected:
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestSize() const;
+    WXHWND GetEditHWND() const;

 };
 
 #endif // wxUSE_COMBOBOX
 };
 
 #endif // wxUSE_COMBOBOX