projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxListBox::HitTest() from Ryan (patch 1446207)
[wxWidgets.git]
/
src
/
gtk1
/
radiobox.cpp
diff --git
a/src/gtk1/radiobox.cpp
b/src/gtk1/radiobox.cpp
index abe3aed93d8f038273545e9b0873e5a0c54fcdae..156ca7c879405fe70cf4fd65b01f2101d719ae1d 100644
(file)
--- a/
src/gtk1/radiobox.cpp
+++ b/
src/gtk1/radiobox.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: src/gtk/radiobox.cpp
+// Name: src/gtk
1
/radiobox.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-18,10
+18,10
@@
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/frame.h"
#include "wx/log.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk
1
/private.h"
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkkeysyms.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk
1
/win_gtk.h"
//-----------------------------------------------------------------------------
// idle system
//-----------------------------------------------------------------------------
// idle system
@@
-385,11
+385,7
@@
wxString wxRadioBox::GetString( int n ) const
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
GtkLabel *label = GTK_LABEL( BUTTON_CHILD(node->GetData()) );
-#ifdef __WXGTK20__
- wxString str( wxGTK_CONV_BACK( gtk_label_get_text(label) ) );
-#else
wxString str( label->label );
wxString str( label->label );
-#endif
return str;
}
return str;
}
@@
-529,10
+525,6
@@
void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
{
gtk_widget_modify_style( m_widget, style );
{
gtk_widget_modify_style( m_widget, style );
-#ifdef __WXGTK20__
- gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
-#endif
-
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
{
wxList::compatibility_iterator node = m_boxes.GetFirst();
while (node)
{