1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h
index cc00ce00b3eed0c2e410aef0a9e35dd8750b1892..690b16860518e690fb62655b98fbb85f4aa3865b 100644 (file)
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -12,7 +12,7 @@
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 
 #ifndef _WX_CHOICE_H_
 #define _WX_CHOICE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "choice.h"
 #endif
 
     #pragma interface "choice.h"
 #endif
 


@@ -22,8 +22,6 @@
 
 class WXDLLEXPORT wxChoice : public wxChoiceBase
 {
 
 class WXDLLEXPORT wxChoice : public wxChoiceBase
 {

-    DECLARE_DYNAMIC_CLASS(wxChoice)
-

 public:
     // ctors
     wxChoice() { }
 public:
     // ctors
     wxChoice() { }


@@ -40,6 +38,17 @@ public:
     {
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
     {
         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,


@@ -49,9 +58,18 @@ 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);

+    virtual int DoInsert(const wxString& item, int pos);

     virtual void Delete(int n);
     virtual void Clear();
 
     virtual void Delete(int n);
     virtual void Clear();
 


@@ -65,11 +83,12 @@ 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);
 
 protected:
     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 void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );
     virtual void DoSetItemClientData( int n, void* clientData );
     virtual void* DoGetItemClientData( int n ) const;
     virtual void DoSetItemClientObject( int n, wxClientData* clientData );


@@ -77,12 +96,30 @@ 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 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();

+
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxChoice)

 };
 
 #endif // _WX_CHOICE_H_
 };
 
 #endif // _WX_CHOICE_H_