Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Expand tabs, identation/whitespace fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mart Raudsepp
2005-08-08 09:50:13 +00:00
parent 86e69fa54a
commit 88d197753d
8 changed files with 124 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gtk/menu.cpp
View File

@@ -349,11 +349,11 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menu->m_owner, gtk_widget_add_accelerator (menu->m_owner,
"activate_item", "activate_item",
m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
#endif #endif
@@ -1191,8 +1191,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
(gpointer)this ); (gpointer)this );
if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
{ {
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
gtk_widget_show( mitem->GetSubMenu()->m_menu ); gtk_widget_show( mitem->GetSubMenu()->m_menu );
@@ -1202,23 +1202,24 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
// submenu // submenu
if ( m_invokingWindow ) if ( m_invokingWindow )
wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow); wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
} }
else else
{ {
gtk_signal_connect( GTK_OBJECT(menuItem), "activate", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );
} }
#ifndef __WXGTK20__ #ifndef __WXGTK20__
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) ); guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menuItem, gtk_widget_add_accelerator (menuItem,
"activate_item", "activate_item",
gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)), gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
#endif #endif
} }
@@ -1273,7 +1274,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{ {
wxMenuItem *item = node->GetData(); wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem) if (item->GetMenuItem() == menuItem)
return item->GetId(); return item->GetId();
node = node->GetNext(); node = node->GetNext();
} }

2
src/gtk/notebook.cpp
View File

@@ -722,7 +722,7 @@ bool wxNotebook::InsertPage( size_t position,
SetSelection( GetPageCount()-1 ); SetSelection( GetPageCount()-1 );
else else
#endif #endif
SetSelection( position ); SetSelection( position );
} }
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",

16
src/gtk/popupwin.cpp
View File

@@ -53,9 +53,9 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
if (child != widget) if (child != widget)
{ {
while (child) while (child)
{ {
if (child == widget) if (child == widget)
return FALSE; return FALSE;
child = child->parent; child = child->parent;
} }
} }
@@ -142,11 +142,11 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child ) static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
{ {
gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
GTK_WIDGET(child->m_widget), GTK_WIDGET(child->m_widget),
child->m_x, child->m_x,
child->m_y, child->m_y,
child->m_width, child->m_width,
child->m_height ); child->m_height );
if (parent->HasFlag(wxTAB_TRAVERSAL)) if (parent->HasFlag(wxTAB_TRAVERSAL))
{ {

12
src/gtk/spinbutt.cpp
View File

@@ -75,15 +75,15 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
win->m_adjust->value = win->m_oldPos; win->m_adjust->value = win->m_oldPos;
gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust), gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust),
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) win ); (gpointer) win );
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
gtk_signal_connect( GTK_OBJECT (win->m_adjust), gtk_signal_connect( GTK_OBJECT (win->m_adjust),
"value_changed", "value_changed",
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) win ); (gpointer) win );
return; return;
} }
@@ -131,7 +131,7 @@ bool wxSpinButton::Create(wxWindow *parent,
!CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxXX creation failed") );
return FALSE; return FALSE;
} }
m_oldPos = 0.0; m_oldPos = 0.0;

39
src/gtk1/menu.cpp
View File

@@ -349,11 +349,11 @@ bool wxMenuBar::GtkAppend(wxMenu *menu, const wxString& title, int pos)
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menu->m_owner, gtk_widget_add_accelerator (menu->m_owner,
"activate_item", "activate_item",
m_accel,//gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)), m_accel, //gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menubar)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
#endif #endif
@@ -1191,8 +1191,8 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
GTK_SIGNAL_FUNC(gtk_menu_nolight_callback), GTK_SIGNAL_FUNC(gtk_menu_nolight_callback),
(gpointer)this ); (gpointer)this );
if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK ) if ( mitem->IsSubMenu() && mitem->GetKind() != wxITEM_RADIO && mitem->GetKind() != wxITEM_CHECK )
{ {
gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu ); gtk_menu_item_set_submenu( GTK_MENU_ITEM(menuItem), mitem->GetSubMenu()->m_menu );
gtk_widget_show( mitem->GetSubMenu()->m_menu ); gtk_widget_show( mitem->GetSubMenu()->m_menu );
@@ -1202,23 +1202,24 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem, int pos)
// submenu // submenu
if ( m_invokingWindow ) if ( m_invokingWindow )
wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow); wxMenubarSetInvokingWindow(mitem->GetSubMenu(), m_invokingWindow);
} }
else else
{ {
gtk_signal_connect( GTK_OBJECT(menuItem), "activate", gtk_signal_connect( GTK_OBJECT(menuItem), "activate",
GTK_SIGNAL_FUNC(gtk_menu_clicked_callback), GTK_SIGNAL_FUNC(gtk_menu_clicked_callback),
(gpointer)this ); (gpointer)this );
} }
#ifndef __WXGTK20__ #ifndef __WXGTK20__
guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) ); guint accel_key = gtk_label_parse_uline (GTK_LABEL(label), wxGTK_CONV( text ) );
if (accel_key != GDK_VoidSymbol) if (accel_key != GDK_VoidSymbol)
{ {
gtk_widget_add_accelerator (menuItem, gtk_widget_add_accelerator (menuItem,
"activate_item", "activate_item",
gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)), gtk_menu_ensure_uline_accel_group(GTK_MENU(m_menu)),
accel_key, accel_key,
GDK_MOD1_MASK, GDK_MOD1_MASK,
GTK_ACCEL_LOCKED); GTK_ACCEL_LOCKED);
} }
#endif #endif
} }
@@ -1273,7 +1274,7 @@ int wxMenu::FindMenuIdByMenuItem( GtkWidget *menuItem ) const
{ {
wxMenuItem *item = node->GetData(); wxMenuItem *item = node->GetData();
if (item->GetMenuItem() == menuItem) if (item->GetMenuItem() == menuItem)
return item->GetId(); return item->GetId();
node = node->GetNext(); node = node->GetNext();
} }

2
src/gtk1/notebook.cpp
View File

@@ -722,7 +722,7 @@ bool wxNotebook::InsertPage( size_t position,
SetSelection( GetPageCount()-1 ); SetSelection( GetPageCount()-1 );
else else
#endif #endif
SetSelection( position ); SetSelection( position );
} }
gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page", gtk_signal_connect( GTK_OBJECT(m_widget), "switch_page",

16
src/gtk1/popupwin.cpp
View File

@@ -53,9 +53,9 @@ static gint gtk_popup_button_press (GtkWidget *widget, GdkEvent *gdk_event, wxPo
if (child != widget) if (child != widget)
{ {
while (child) while (child)
{ {
if (child == widget) if (child == widget)
return FALSE; return FALSE;
child = child->parent; child = child->parent;
} }
} }
@@ -142,11 +142,11 @@ gtk_dialog_realized_callback( GtkWidget * WXUNUSED(widget), wxPopupWindow *win )
static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child ) static void wxInsertChildInDialog( wxPopupWindow* parent, wxWindow* child )
{ {
gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow), gtk_pizza_put( GTK_PIZZA(parent->m_wxwindow),
GTK_WIDGET(child->m_widget), GTK_WIDGET(child->m_widget),
child->m_x, child->m_x,
child->m_y, child->m_y,
child->m_width, child->m_width,
child->m_height ); child->m_height );
if (parent->HasFlag(wxTAB_TRAVERSAL)) if (parent->HasFlag(wxTAB_TRAVERSAL))
{ {

12
src/gtk1/spinbutt.cpp
View File

@@ -75,15 +75,15 @@ static void gtk_spinbutt_callback( GtkWidget *WXUNUSED(widget), wxSpinButton *wi
win->m_adjust->value = win->m_oldPos; win->m_adjust->value = win->m_oldPos;
gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust), gtk_signal_disconnect_by_func( GTK_OBJECT (win->m_adjust),
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) win ); (gpointer) win );
gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" ); gtk_signal_emit_by_name( GTK_OBJECT(win->m_adjust), "value_changed" );
gtk_signal_connect( GTK_OBJECT (win->m_adjust), gtk_signal_connect( GTK_OBJECT (win->m_adjust),
"value_changed", "value_changed",
(GtkSignalFunc) gtk_spinbutt_callback, (GtkSignalFunc) gtk_spinbutt_callback,
(gpointer) win ); (gpointer) win );
return; return;
} }
@@ -131,7 +131,7 @@ bool wxSpinButton::Create(wxWindow *parent,
!CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name )) !CreateBase( parent, id, pos, new_size, style, wxDefaultValidator, name ))
{ {
wxFAIL_MSG( wxT("wxXX creation failed") ); wxFAIL_MSG( wxT("wxXX creation failed") );
return FALSE; return FALSE;
} }
m_oldPos = 0.0; m_oldPos = 0.0;