projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[wxWidgets.git]
/
src
/
gtk1
/
checklst.cpp
diff --git
a/src/gtk1/checklst.cpp
b/src/gtk1/checklst.cpp
index 57bd258ee11ba70c260ecab7dded8fbc5c1923b8..03909142071d7529a9f627fe008c1f78dde0aa17 100644
(file)
--- a/
src/gtk1/checklst.cpp
+++ b/
src/gtk1/checklst.cpp
@@
-13,8
+13,10
@@
#include "wx/checklst.h"
#include "wx/checklst.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#if wxUSE_CHECKLISTBOX
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
//-----------------------------------------------------------------------------
// wxCheckListBox
//-----------------------------------------------------------------------------
// wxCheckListBox
@@
-42,7
+44,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)
@@
-50,18
+52,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 =
label->label
;
+ wxString str =
wxString(label->label,*wxConvCurrent)
;
- return (str
[1] == 'X'
);
+ return (str
.GetChar(1) == wxT('X')
);
}
}
- 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)
@@
-69,21
+71,21
@@
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 =
label->label
;
+ wxString str =
wxString(label->label,*wxConvCurrent)
;
- if (check == (str
[1] == _
T('X'))) return;
+ if (check == (str
.GetChar(1) == wx
T('X'))) return;
if (check)
if (check)
- str.SetChar( 1,
_
T('X') );
+ str.SetChar( 1,
wx
T('X') );
else
else
- str.SetChar( 1,
_
T('-') );
+ str.SetChar( 1,
wx
T('-') );
gtk_label_set( label, str.mbc_str() );
return;
}
gtk_label_set( label, str.mbc_str() );
return;
}
- wxFAIL_MSG(
_
T("wrong checklistbox index"));
+ wxFAIL_MSG(
wx
T("wrong checklistbox index"));
}
int wxCheckListBox::GetItemHeight() const
}
int wxCheckListBox::GetItemHeight() const
@@
-91,3
+93,5
@@
int wxCheckListBox::GetItemHeight() const
// FIXME
return 22;
}
// FIXME
return 22;
}
+
+#endif