wxWindow::Freeze()/Thaw() can now be nested

[wxWidgets.git] / include / wx / mac / checklst.h

diff --git a/include/wx/mac/checklst.h b/include/wx/mac/checklst.h
index be7f73292d09fe824ab86f34c1c06f961e97fc57..35f3bd885deebeede877992f0971fea39bbc0f2a 100644 (file)
--- a/include/wx/mac/checklst.h
+++ b/include/wx/mac/checklst.h
@@ -2,18 +2,18 @@
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.

-// Author:      AUTHOR
-// Modified by: 
-// Created:     ??/??/98
+// Author:      Stefan Csomor
+// Modified by:
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 

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

 #pragma interface "checklst.h"
 #endif
 
 #pragma interface "checklst.h"
 #endif
 


@@ -21,7 +21,7 @@
 typedef   unsigned int  size_t;
 #endif
 
 typedef   unsigned int  size_t;
 #endif
 

-class wxCheckListBox : public wxCheckListBoxBase
+class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase

 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:
 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:


@@ -41,6 +41,19 @@ public:
 
         Create(parent, id, pos, size, nStrings, choices, style, validator, name);
     }
 
         Create(parent, id, pos, size, nStrings, choices, style, validator, name);
     }

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

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


@@ -51,6 +64,14 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);

+    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 = wxListBoxNameStr);

 
   // items may be checked
   bool  IsChecked(size_t uiIndex) const;
 
   // items may be checked
   bool  IsChecked(size_t uiIndex) const;


@@ -58,6 +79,11 @@ public:
   void OnChar(wxKeyEvent& event) ;
   void OnLeftClick(wxMouseEvent& event) ;
 
   void OnChar(wxKeyEvent& event) ;
   void OnLeftClick(wxMouseEvent& event) ;
 

+    // metrics
+    wxInt32 m_checkBoxWidth;
+    wxInt32 m_checkBoxHeight;
+    wxInt32    m_TextBaseLineOffset;
+

     // the array containing the checked status of the items
     wxArrayInt m_checks;
 
     // the array containing the checked status of the items
     wxArrayInt m_checks;