Calculate correct client size for windows that are using deferred sizing.

[wxWidgets.git] / src / cocoa / checklst.mm

diff --git a/src/cocoa/checklst.mm b/src/cocoa/checklst.mm
index abda41c2a4fed4a174b0c3767057e793dc20a128..f3a68f99ac2ed46ac6fb1195cf9fcce04fa911b9 100644 (file)
--- a/src/cocoa/checklst.mm
+++ b/src/cocoa/checklst.mm
@@ -6,10 +6,13 @@
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/03/18
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#if wxUSE_CHECKLISTBOX
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.h"


@@ -21,6 +24,20 @@ BEGIN_EVENT_TABLE(wxCheckListBox, wxCheckListBoxBase)
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
 
 END_EVENT_TABLE()
 // WX_IMPLEMENT_COCOA_OWNER(wxCheckListBox,NSButton,NSControl,NSView)
 

+bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
+            const wxPoint& pos,
+            const wxSize& size,
+            const wxArrayString& choices,
+            long style,
+            const wxValidator& validator,
+            const wxString& name)
+{
+    wxCArrayString chs(choices);
+
+    return Create(parent, winid, pos, size, chs.GetCount(), chs.GetStrings(),
+                  style, validator, name);
+}
+

 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,
 bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
             const wxPoint& pos,
             const wxSize& size,


@@ -39,7 +56,6 @@ bool wxCheckListBox::Create(wxWindow *parent, wxWindowID winid,
 
 wxCheckListBox::~wxCheckListBox()
 {
 
 wxCheckListBox::~wxCheckListBox()
 {

-    CocoaRemoveFromParent();

 }
 
 bool wxCheckListBox::IsChecked(size_t item) const
 }
 
 bool wxCheckListBox::IsChecked(size_t item) const


@@ -52,3 +68,4 @@ void wxCheckListBox::Check(size_t item, bool check)
 {
 }
 
 {
 }
 

+#endif