Applied patch [ 1181975 ] [wxMSW] Removes all flicker from wxNotebook

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

diff --git a/include/wx/os2/listbox.h b/include/wx/os2/listbox.h
index ffe2719d88df2998b178c21faa4e9acf2bbd14e6..f0bd7cf3e3645d5dc9ecebc75561fb5569caeb8a 100644 (file)
--- a/include/wx/os2/listbox.h
+++ b/include/wx/os2/listbox.h
@@ -44,9 +44,7 @@ public:
               ,int                n = 0
               ,const wxString     asChoices[] = NULL
               ,long               lStyle = 0
               ,int                n = 0
               ,const wxString     asChoices[] = NULL
               ,long               lStyle = 0

-#if wxUSE_VALIDATORS

               ,const wxValidator& rValidator = wxDefaultValidator
               ,const wxValidator& rValidator = wxDefaultValidator

-#endif

               ,const wxString&    rsName = wxListBoxNameStr)
     {
         Create( pParent
               ,const wxString&    rsName = wxListBoxNameStr)
     {
         Create( pParent


@@ -56,9 +54,26 @@ public:
                ,n
                ,asChoices
                ,lStyle
                ,n
                ,asChoices
                ,lStyle

-#if wxUSE_VALIDATORS

                ,rValidator
                ,rValidator

-#endif
+               ,rsName
+              );
+    }
+    wxListBox( wxWindow*            pParent
+              ,wxWindowID           vId
+              ,const wxPoint&       rPos
+              ,const wxSize&        rSize
+              ,const wxArrayString& asChoices
+              ,long                 lStyle = 0
+              ,const wxValidator&   rValidator = wxDefaultValidator
+              ,const wxString&      rsName = wxListBoxNameStr)
+    {
+        Create( pParent
+               ,vId
+               ,rPos
+               ,rSize
+               ,asChoices
+               ,lStyle
+               ,rValidator

                ,rsName
               );
     }
                ,rsName
               );
     }


@@ -70,11 +85,18 @@ public:
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0
                 ,int                n = 0
                 ,const wxString     asChoices[] = NULL
                 ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                 ,const wxValidator& rValidator = wxDefaultValidator
                 ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                 ,const wxString&    rsName = wxListBoxNameStr
                );
                 ,const wxString&    rsName = wxListBoxNameStr
                );

+    bool Create( wxWindow*            pParent
+                ,wxWindowID           vId
+                ,const wxPoint&       rPos
+                ,const wxSize&        rSize
+                ,const wxArrayString& asChoices
+                ,long                 lStyle = 0
+                ,const wxValidator&   rValidator = wxDefaultValidator
+                ,const wxString&      rsName = wxListBoxNameStr
+               );

 
     virtual ~wxListBox();
 
 
     virtual ~wxListBox();
 


@@ -92,8 +114,8 @@ public:
     virtual int           FindString(const wxString& rsString) const;
 
     virtual bool          IsSelected(int n) const;
     virtual int           FindString(const wxString& rsString) const;
 
     virtual bool          IsSelected(int n) const;

-    virtual void          SetSelection( int  n
-                                       ,bool bSelect = TRUE
+    virtual void          DoSetSelection( int  n
+                                       ,bool bSelect

                                       );
     virtual int           GetSelection(void) const;
     virtual int           GetSelections(wxArrayInt& raSelections) const;
                                       );
     virtual int           GetSelection(void) const;
     virtual int           GetSelections(wxArrayInt& raSelections) const;


@@ -121,7 +143,7 @@ public:
     // wxCheckListBox support
     //
 #if wxUSE_OWNER_DRAWN
     // wxCheckListBox support
     //
 #if wxUSE_OWNER_DRAWN

-    bool                  OS2OnMeasure(WXMEASUREITEMSTRUCT *item);
+    long                  OS2OnMeasure(WXMEASUREITEMSTRUCT *item);

     bool                  OS2OnDraw(WXDRAWITEMSTRUCT *item);
 
     virtual wxOwnerDrawn* CreateItem(size_t n);
     bool                  OS2OnDraw(WXDRAWITEMSTRUCT *item);
 
     virtual wxOwnerDrawn* CreateItem(size_t n);


@@ -151,21 +173,6 @@ protected:
 #endif
 
 private:
 #endif
 
 private:

-#if wxUSE_WX_RESOURCES
-#  if wxUSE_OWNER_DRAWN
-    virtual wxControl*    CreateItem( const wxItemResource*  pChildResource
-                                     ,const wxItemResource*  pParentResource
-                                     ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
-                                    )
-    {
-        return(wxWindowBase::CreateItem( pChildResource
-                                        ,pParentResource
-                                        ,pTable
-                                       )
-              );
-    }
-#  endif
-#endif

     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 }; // end of wxListBox