more 64 bit correctness fixes

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index 72d813afc2843536b0642ff66e522243bc724527..15b1bb818e4808536873e2b32ae4f05ffb34b2f7 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -24,7 +24,7 @@ class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 public:
     // ctors
 {
 public:
     // ctors

-    wxChoice();
+    wxChoice() { }

     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,
     virtual ~wxChoice();
 
     wxChoice(wxWindow *parent,


@@ -34,7 +34,21 @@ public:
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              int n = 0, const wxString choices[] = NULL,
              long style = 0,
              const wxValidator& validator = wxDefaultValidator,

-             const wxString& name = wxChoiceNameStr);
+             const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, n, choices, style, validator, name);
+    }
+    wxChoice(wxWindow *parent,
+             wxWindowID id,
+             const wxPoint& pos,
+             const wxSize& size,
+             const wxArrayString& choices,
+             long style = 0,
+             const wxValidator& validator = wxDefaultValidator,
+             const wxString& name = wxChoiceNameStr)
+    {
+        Create(parent, id, pos, size, choices, style, validator, name);
+    }

 
     bool Create(wxWindow *parent,
                 wxWindowID id,
 
     bool Create(wxWindow *parent,
                 wxWindowID id,


@@ -44,6 +58,14 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxChoiceNameStr);

+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxChoiceNameStr);

 
     // implement base class pure virtuals
     virtual int DoAppend(const wxString& item);
 
     // implement base class pure virtuals
     virtual int DoAppend(const wxString& item);


@@ -61,7 +83,7 @@ public:
 
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);
 
     // MSW only
     virtual bool MSWCommand(WXUINT param, WXWORD id);

-    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);

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


@@ -74,10 +96,28 @@ protected:
 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;
 
     // MSW implementation
     virtual wxSize DoGetBestSize() const;

+    virtual void DoGetSize(int *w, int *h) const;

     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 
     virtual void DoSetSize(int x, int y,
                            int width, int height,
                            int sizeFlags = wxSIZE_AUTO);
 

+    virtual bool MSWShouldPreProcessMessage(WXMSG *pMsg);
+
+    virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+    // update the height of the drop down list to fit the number of items we
+    // have (without changing the visible height)
+    void UpdateVisibleHeight();
+
+    // create and initialize the control
+    bool CreateAndInit(wxWindow *parent, wxWindowID id,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       int n, const wxString choices[],
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name);
+

     // free all memory we have (used by Clear() and dtor)
     void Free();
 
     // free all memory we have (used by Clear() and dtor)
     void Free();