projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added stub for the new pure virtual DoInsert method
[wxWidgets.git]
/
src
/
gtk
/
checklst.cpp
diff --git
a/src/gtk/checklst.cpp
b/src/gtk/checklst.cpp
index 6e97994417b488e5b0f3ceed1ba43226ad3054c5..5a4f2469f578612018e7ab05e8d2f72a7d40c37b 100644
(file)
--- a/
src/gtk/checklst.cpp
+++ b/
src/gtk/checklst.cpp
@@
-11,12
+11,15
@@
#pragma implementation "checklst.h"
#endif
#pragma implementation "checklst.h"
#endif
-#include "wx/
checklst
.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>
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------
// wxCheckListBox
@@
-30,13
+33,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
+47,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,
wx
T("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
+55,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,*wxConvCurrent
);
+ 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(
wx
T("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,
wx
T("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
+74,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(
wx
T("wrong checklistbox index"));
}
int wxCheckListBox::GetItemHeight() const
}
int wxCheckListBox::GetItemHeight() const