X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fdialog.cpp;h=4f71d41b2bfb65fc8c49670c26c365415b0c7648;hb=f33fed31ce7fdaee4829b9486e0f6fccbd9e4764;hp=b85e3ed78126611dab355f1dc13a2b9a8b87b7f8;hpb=33efc9089296fc4e5f54d43581a0db81576ba848;p=xonotic%2Fnetradiant.git diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index b85e3ed7..4f71d41b 100644 --- a/radiant/dialog.cpp +++ b/radiant/dialog.cpp @@ -94,7 +94,7 @@ void Dialog::Create () g_object_set_data (G_OBJECT (m_pWidget), "loop", &m_nLoop); g_object_set_data (G_OBJECT (m_pWidget), "ret", &m_nReturn); - BuildDialog (); + BuildDialog(); m_bNeedBuild = false; } } @@ -108,7 +108,7 @@ void Dialog::Destroy () } } -void Dialog::AddDialogData (GtkObject *object, void *buf, DLG_DATA_TYPE type) +void Dialog::AddDialogData( GtkObject *object, void *buf, DLG_DATA_TYPE type ) { DLG_DATA *data; @@ -120,10 +120,9 @@ void Dialog::AddDialogData (GtkObject *object, void *buf, DLG_DATA_TYPE type) m_pDataList = g_slist_append (m_pDataList, data); } -void Dialog::AddModalButton (GtkWidget *widget, int ret) -{ - gtk_signal_connect (GTK_OBJECT (widget), "clicked", - GTK_SIGNAL_FUNC (dialog_button_callback), GINT_TO_POINTER (ret)); +void Dialog::AddModalButton( GtkWidget *widget, int ret ) { + gtk_signal_connect( GTK_OBJECT( widget ), "clicked", + GTK_SIGNAL_FUNC( dialog_button_callback ), GINT_TO_POINTER( ret ) ); } void Dialog::UpdateData (bool retrieve) @@ -261,35 +260,33 @@ void Dialog::UpdateData (bool retrieve) } } -void Dialog::EndModal (int code) -{ +void Dialog::EndModal( int code ) { m_nLoop = 0; m_nReturn = code; } -int Dialog::DoModal () +int Dialog::DoModal() { - Create (); - UpdateData (FALSE); + Create(); + UpdateData( FALSE ); PreModal(); - gtk_grab_add (m_pWidget); - gtk_widget_show (m_pWidget); + gtk_grab_add( m_pWidget ); + gtk_widget_show( m_pWidget ); m_nLoop = 1; - while (m_nLoop) - gtk_main_iteration (); + while ( m_nLoop ) { + gtk_main_iteration(); + } - if (m_pWidget != NULL) - { - UpdateData (TRUE); + if ( m_pWidget != NULL ) { + UpdateData( TRUE ); - gtk_grab_remove (m_pWidget); - gtk_widget_hide (m_pWidget); + gtk_grab_remove( m_pWidget ); + gtk_widget_hide( m_pWidget ); } - PostModal (m_nReturn); + PostModal( m_nReturn ); return m_nReturn; } -