A little clarification

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

diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp
index 6c08581ae66b745e3270bcbd8d3cbfe344a15731..0f754b7d52e088e44ef069ac7fa1b947311b73b3 100644 (file)
--- a/src/gtk/checklst.cpp
+++ b/src/gtk/checklst.cpp
@@ -7,16 +7,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 #pragma implementation "checklst.h"
 #endif
 
 #pragma implementation "checklst.h"
 #endif
 

-#include "wx/checklst.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#include "wx/defs.h"

 
 #if wxUSE_CHECKLISTBOX
 
 
 #if wxUSE_CHECKLISTBOX
 

-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include "wx/checklst.h"
+#include "wx/gtk/private.h"
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+//-----------------------------------------------------------------------------
+// wxCheckListBoxBase
+//-----------------------------------------------------------------------------
+
+wxCheckListBoxBase::wxCheckListBoxBase()
+{
+}

 
 //-----------------------------------------------------------------------------
 // wxCheckListBox
 
 //-----------------------------------------------------------------------------
 // wxCheckListBox


@@ -30,13 +44,13 @@ wxCheckListBox::wxCheckListBox() : wxListBox()
 }
 
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 }
 
 wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,

-                 const wxPoint& pos,
-                 const wxSize& size,
-                 int nStrings, 
-                 const wxString *choices,
-                 long style,
-                 const wxValidator& validator,
-                 const wxString& name )
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               int nStrings, 
+                               const wxString *choices,
+                               long style,
+                               const wxValidator& validator,
+                               const wxString& name )

 {
     m_hasCheckBoxes = TRUE;
     wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );
 {
     m_hasCheckBoxes = TRUE;
     wxListBox::Create( parent, id, pos, size, nStrings, choices, style, validator, name );


@@ -44,7 +58,7 @@ wxCheckListBox::wxCheckListBox(wxWindow *parent, wxWindowID id,
 
 bool wxCheckListBox::IsChecked( int index ) const
 {
 
 bool wxCheckListBox::IsChecked( int index ) const
 {

-    wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid checklistbox") );
+    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid checklistbox") );

 
     GList *child = g_list_nth( m_list->children, index );
     if (child)
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)


@@ -52,18 +66,18 @@ bool wxCheckListBox::IsChecked( int index ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str = wxString(label->label,*wxConv_current);
+        wxString str( wxGTK_CONV_BACK( label->label ) );

 
 

-        return (str[1] == _T('X'));
+        return str.GetChar(1) == wxCHECKLBOX_CHECKED;

     }
 
     }
 

-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));

     return FALSE;
 }
 
 void wxCheckListBox::Check( int index, bool check )
 {
     return FALSE;
 }
 
 void wxCheckListBox::Check( int index, bool check )
 {

-    wxCHECK_RET( m_list != NULL, _T("invalid checklistbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid checklistbox") );

 
     GList *child = g_list_nth( m_list->children, index );
     if (child)
 
     GList *child = g_list_nth( m_list->children, index );
     if (child)


@@ -71,21 +85,19 @@ void wxCheckListBox::Check( int index, bool check )
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 

-        wxString str = wxString(label->label,*wxConvCurrent);
+        wxString str( wxGTK_CONV_BACK( label->label ) );

 
 

-        if (check == (str[1] == _T('X'))) return;
+        if (check == (str.GetChar(1) == wxCHECKLBOX_CHECKED))
+            return;

 
 

-        if (check)
-            str.SetChar( 1, _T('X') );
-        else
-            str.SetChar( 1, _T('-') );
+        str.SetChar( 1, check ? wxCHECKLBOX_CHECKED : wxCHECKLBOX_UNCHECKED );

 
 

-        gtk_label_set( label, str.mbc_str() );
+        gtk_label_set( label, wxGTK_CONV( str ) );

 
         return;
     }
 
 
         return;
     }
 

-    wxFAIL_MSG(_T("wrong checklistbox index"));
+    wxFAIL_MSG(wxT("wrong checklistbox index"));

 }
 
 int wxCheckListBox::GetItemHeight() const
 }
 
 int wxCheckListBox::GetItemHeight() const