cleanup - reformat

[wxWidgets.git] / src / univ / checklst.cpp

diff --git a/src/univ/checklst.cpp b/src/univ/checklst.cpp
index df130aa29070a7e692aee154e8882fef90eee7c2..cfb181734351248a02b4b9457613c2a97d2c32ea 100644 (file)
--- a/src/univ/checklst.cpp
+++ b/src/univ/checklst.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "univchecklst.h"
-#endif
-

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


@@ -55,6 +51,35 @@ void wxCheckListBox::Init()
 {
 }
 
 {
 }
 

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

 bool wxCheckListBox::Create(wxWindow *parent,
                             wxWindowID id,
                             const wxPoint &pos,
 bool wxCheckListBox::Create(wxWindow *parent,
                             wxWindowID id,
                             const wxPoint &pos,


@@ -67,11 +92,11 @@ bool wxCheckListBox::Create(wxWindow *parent,
 {
     if ( !wxListBox::Create(parent, id, pos, size,
                             n, choices, style, validator, name) )
 {
     if ( !wxListBox::Create(parent, id, pos, size,
                             n, choices, style, validator, name) )

-        return FALSE;
+        return false;

 
     CreateInputHandler(wxINP_HANDLER_CHECKLISTBOX);
 
 
     CreateInputHandler(wxINP_HANDLER_CHECKLISTBOX);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -80,7 +105,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {
 
 bool wxCheckListBox::IsChecked(size_t item) const
 {

-    wxCHECK_MSG( item < m_checks.GetCount(), FALSE,
+    wxCHECK_MSG( item < m_checks.GetCount(), false,

                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return m_checks[item] != 0;
                  _T("invalid index in wxCheckListBox::IsChecked") );
 
     return m_checks[item] != 0;


@@ -119,7 +144,7 @@ int wxCheckListBox::DoAppend(const wxString& item)
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked
     int pos = wxListBox::DoAppend(item);
 
     // the item is initially unchecked

-    m_checks.Insert(FALSE, pos);
+    m_checks.Insert(false, pos);

 
     return pos;
 }
 
     return pos;
 }


@@ -131,7 +156,7 @@ void wxCheckListBox::DoInsertItems(const wxArrayString& items, int pos)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Insert(FALSE, pos + n);
+        m_checks.Insert(false, pos + n);

     }
 }
 
     }
 }
 


@@ -143,7 +168,7 @@ void wxCheckListBox::DoSetItems(const wxArrayString& items, void **clientData)
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = items.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {

-        m_checks.Add(FALSE);
+        m_checks.Add(false);

     }
 }
 
     }
 }
 


@@ -198,7 +223,7 @@ bool wxCheckListBox::PerformAction(const wxControlAction& action,
         return wxListBox::PerformAction(action, numArg, strArg);
     }
 
         return wxListBox::PerformAction(action, numArg, strArg);
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -211,26 +236,26 @@ wxStdCheckListboxInputHandler(wxInputHandler *inphand)
 {
 }
 
 {
 }
 

-bool wxStdCheckListboxInputHandler::HandleKey(wxControl *control,
+bool wxStdCheckListboxInputHandler::HandleKey(wxInputConsumer *consumer,

                                               const wxKeyEvent& event,
                                               bool pressed)
 {
     if ( pressed && (event.GetKeyCode() == WXK_SPACE) )
                                               const wxKeyEvent& event,
                                               bool pressed)
 {
     if ( pressed && (event.GetKeyCode() == WXK_SPACE) )

-        control->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE);
+        consumer->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE);

 
 

-    return wxStdListboxInputHandler::HandleKey(control, event, pressed);
+    return wxStdListboxInputHandler::HandleKey(consumer, event, pressed);

 }
 
 }
 

-bool wxStdCheckListboxInputHandler::HandleMouse(wxControl *control,
+bool wxStdCheckListboxInputHandler::HandleMouse(wxInputConsumer *consumer,

                                                 const wxMouseEvent& event)
 {
     if ( event.LeftDown() || event.LeftDClick() )
     {
                                                 const wxMouseEvent& event)
 {
     if ( event.LeftDown() || event.LeftDClick() )
     {

-        wxCheckListBox *lbox = wxStaticCast(control, wxCheckListBox);
+        wxCheckListBox *lbox = wxStaticCast(consumer->GetInputWindow(), wxCheckListBox);

         int x, y;
 
         wxPoint pt = event.GetPosition();
         int x, y;
 
         wxPoint pt = event.GetPosition();

-        pt -= control->GetClientAreaOrigin();
+        pt -= consumer->GetInputWindow()->GetClientAreaOrigin();

         lbox->CalcUnscrolledPosition(pt.x, pt.y, &x, &y);
 
         wxRenderer *renderer = lbox->GetRenderer();
         lbox->CalcUnscrolledPosition(pt.x, pt.y, &x, &y);
 
         wxRenderer *renderer = lbox->GetRenderer();


@@ -244,11 +269,11 @@ bool wxStdCheckListboxInputHandler::HandleMouse(wxControl *control,
         {
             lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
 
         {
             lbox->PerformAction(wxACTION_CHECKLISTBOX_TOGGLE, item);
 

-            return TRUE;
+            return true;

         }
     }
 
         }
     }
 

-    return wxStdListboxInputHandler::HandleMouse(control, event);
+    return wxStdListboxInputHandler::HandleMouse(consumer, event);

 }
 
 #endif // wxUSE_CHECKLISTBOX
 }
 
 #endif // wxUSE_CHECKLISTBOX