quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the rest of errors with CFLAGS+="-DGSEAL_ENABLE" except accel_label->accel_string required hack

Browse Source
This commit is contained in:
Garux 2020-05-20 02:51:37 +03:00
parent 50e1af1a16
commit 4f8e6e7ee5
12 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bobtoolz/dialogs/dialogs-gtk.cpp
View File

@ -357,7 +357,7 @@ EMessageBoxReturn DoIntersectBox( IntersectRS* rs ){
gtk_box_pack_start( GTK_BOX( vbox ), radio1, FALSE, FALSE, 2 ); gtk_box_pack_start( GTK_BOX( vbox ), radio1, FALSE, FALSE, 2 );
gtk_widget_show( radio1 ); gtk_widget_show( radio1 );
radio2 = gtk_radio_button_new_with_label( ( (GtkRadioButton*)radio1 )->group, "Use Selected Brushes" ); radio2 = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radio1), "Use Selected Brushes" );
gtk_box_pack_start( GTK_BOX( vbox ), radio2, FALSE, FALSE, 2 ); gtk_box_pack_start( GTK_BOX( vbox ), radio2, FALSE, FALSE, 2 );
gtk_widget_show( radio2 ); gtk_widget_show( radio2 );

2
contrib/brushexport/support.cpp
View File

@ -13,7 +13,7 @@ lookup_widget( GtkWidget *widget,
parent = gtk_menu_get_attach_widget( GTK_MENU( widget ) ); parent = gtk_menu_get_attach_widget( GTK_MENU( widget ) );
} }
else{ else{
parent = widget->parent; parent = gtk_widget_get_parent( widget );
} }
if ( !parent ) { if ( !parent ) {
parent = (GtkWidget*) g_object_get_data( G_OBJECT( widget ), "GladeParentKey" ); parent = (GtkWidget*) g_object_get_data( G_OBJECT( widget ), "GladeParentKey" );

2
contrib/meshtex/GenericDialog.h
View File

@ -48,7 +48,7 @@
* @param widgetName Name of the contained widget to enable/disable. * @param widgetName Name of the contained widget to enable/disable.
*/ */
#define NamedToggleWidgetActive(widgetName) \ #define NamedToggleWidgetActive(widgetName) \
(GTK_TOGGLE_BUTTON(NamedWidget(widgetName))->active) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(NamedWidget(widgetName)))
/** /**
* Macro to read text from a widget inside the dialog, selected by name. * Macro to read text from a widget inside the dialog, selected by name.

6
contrib/meshtex/GenericPluginUI.cpp
View File

@ -309,7 +309,7 @@ GenericPluginUI::WidgetControlCallback(GtkWidget *widget,
for (; controllerIter != _widgetControlledByMap[controllee].end(); ++controllerIter) for (; controllerIter != _widgetControlledByMap[controllee].end(); ++controllerIter)
{ {
// Dependence found; honor it. // Dependence found; honor it.
if (!(GTK_TOGGLE_BUTTON(*controllerIter)->active)) if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(*controllerIter)))
{ {
sensitive = false; sensitive = false;
break; break;
@ -320,7 +320,7 @@ GenericPluginUI::WidgetControlCallback(GtkWidget *widget,
for (; controllerIter != _widgetAntiControlledByMap[controllee].end(); ++controllerIter) for (; controllerIter != _widgetAntiControlledByMap[controllee].end(); ++controllerIter)
{ {
// Anti-dependence found; honor it. // Anti-dependence found; honor it.
if (GTK_TOGGLE_BUTTON(*controllerIter)->active) if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(*controllerIter)))
{ {
sensitive = false; sensitive = false;
break; break;
@ -371,4 +371,4 @@ GenericPluginUI::InfoReportDialog(const char *title,
{ {
// Pass this operation to Radiant. // Pass this operation to Radiant.
GlobalRadiant().m_pfnMessageBox(UIInstance()._window, message, title, eMB_OK, eMB_ICONDEFAULT); GlobalRadiant().m_pfnMessageBox(UIInstance()._window, message, title, eMB_OK, eMB_ICONDEFAULT);
} }

4
libs/gtkutil/accelerator.cpp
View File

@ -243,7 +243,7 @@ bool Buttons_press( ButtonMask& buttons, guint button, guint state ){
{ {
GtkWindow* toplevel = *i; GtkWindow* toplevel = *i;
ASSERT_MESSAGE( window_has_accel( toplevel ), "ERROR" ); ASSERT_MESSAGE( window_has_accel( toplevel ), "ERROR" );
ASSERT_MESSAGE( GTK_WIDGET_TOPLEVEL( toplevel ), "disabling accel for non-toplevel window" ); ASSERT_MESSAGE( gtk_widget_is_toplevel( GTK_WIDGET( toplevel ) ), "disabling accel for non-toplevel window" );
gtk_window_remove_accel_group( toplevel, global_accel ); gtk_window_remove_accel_group( toplevel, global_accel );
#if 0 #if 0
globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": disabled global accelerators\n"; globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": disabled global accelerators\n";
@ -269,7 +269,7 @@ bool Buttons_release( ButtonMask& buttons, guint button, guint state ){
{ {
GtkWindow* toplevel = *i; GtkWindow* toplevel = *i;
ASSERT_MESSAGE( !window_has_accel( toplevel ), "ERROR" ); ASSERT_MESSAGE( !window_has_accel( toplevel ), "ERROR" );
ASSERT_MESSAGE( GTK_WIDGET_TOPLEVEL( toplevel ), "enabling accel for non-toplevel window" ); ASSERT_MESSAGE( gtk_widget_is_toplevel( GTK_WIDGET( toplevel ) ), "enabling accel for non-toplevel window" );
gtk_window_add_accel_group( toplevel, global_accel ); gtk_window_add_accel_group( toplevel, global_accel );
#if 0 #if 0
globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": enabled global accelerators\n"; globalOutputStream() << reinterpret_cast<unsigned int>( toplevel ) << ": enabled global accelerators\n";

16
libs/gtkutil/menu.cpp
View File

@ -227,23 +227,13 @@ void accelerator_name( const Accelerator& accelerator, GString* gstring ){
} }
void menu_item_set_accelerator( GtkMenuItem* item, Accelerator accelerator ){ void menu_item_set_accelerator( GtkMenuItem* item, Accelerator accelerator ){
GtkAccelLabel* accel_label = GTK_ACCEL_LABEL( gtk_bin_get_child( GTK_BIN( item ) ) ); GString* gstring = g_string_new( nullptr );
g_free( accel_label->accel_string );
accel_label->accel_string = 0;
GString* gstring = g_string_new( accel_label->accel_string );
g_string_append( gstring, " " ); g_string_append( gstring, " " );
accelerator_name( accelerator, gstring ); accelerator_name( accelerator, gstring );
GtkAccelLabel* accel_label = GTK_ACCEL_LABEL( gtk_bin_get_child( GTK_BIN( item ) ) );
g_free( accel_label->accel_string ); g_free( accel_label->accel_string );
accel_label->accel_string = gstring->str; accel_label->accel_string = g_string_free( gstring, FALSE );
g_string_free( gstring, FALSE );
if ( !accel_label->accel_string ) {
accel_label->accel_string = g_strdup( "" );
}
gtk_widget_queue_resize( GTK_WIDGET( accel_label ) ); gtk_widget_queue_resize( GTK_WIDGET( accel_label ) );
} }

2
radiant/console.cpp
View File

@ -228,7 +228,7 @@ std::size_t Sys_Print( int level, const char* buf, std::size_t length ){
if ( contains_newline ) { if ( contains_newline ) {
gtk_text_view_scroll_mark_onscreen( GTK_TEXT_VIEW( g_console ), end ); gtk_text_view_scroll_mark_onscreen( GTK_TEXT_VIEW( g_console ), end );
if ( !ScreenUpdates_Enabled() && GTK_WIDGET_REALIZED( g_console ) ) { if ( !ScreenUpdates_Enabled() && gtk_widget_get_realized( g_console ) ) {
ScreenUpdates_process(); ScreenUpdates_process();
} }
} }

8
radiant/entityinspector.cpp
View File

@ -1037,7 +1037,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
for ( int i = 0; i < g_spawnflag_count; ++i ) for ( int i = 0; i < g_spawnflag_count; ++i )
{ {
GtkWidget* widget = GTK_WIDGET( g_entitySpawnflagsCheck[i] ); GtkWidget* widget = GTK_WIDGET( g_entitySpawnflagsCheck[i] );
gtk_label_set_text( GTK_LABEL( GTK_BIN( widget )->child ), " " ); gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( widget ) ) ), " " );
gtk_widget_hide( widget ); gtk_widget_hide( widget );
gtk_widget_ref( widget ); gtk_widget_ref( widget );
gtk_container_remove( GTK_CONTAINER( g_spawnflagsTable ), widget ); gtk_container_remove( GTK_CONTAINER( g_spawnflagsTable ), widget );
@ -1060,7 +1060,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
(GtkAttachOptions)( GTK_FILL ), 0, 0 ); (GtkAttachOptions)( GTK_FILL ), 0, 0 );
gtk_widget_unref( widget ); gtk_widget_unref( widget );
gtk_label_set_text( GTK_LABEL( GTK_BIN( widget )->child ), str.c_str() ); gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( widget ) ) ), str.c_str() );
if( const EntityClassAttribute* attribute = eclass->flagAttributes[spawn_table[i]] ){ if( const EntityClassAttribute* attribute = eclass->flagAttributes[spawn_table[i]] ){
EntityAttribute_setTooltip( widget, attribute->m_name.c_str(), attribute->m_description.c_str() ); EntityAttribute_setTooltip( widget, attribute->m_name.c_str(), attribute->m_description.c_str() );
@ -1080,7 +1080,7 @@ void EntityClassList_selectEntityClass( EntityClass* eclass ){
GtkTreeView* view = g_entityClassList; GtkTreeView* view = g_entityClassList;
GtkTreePath* path = gtk_tree_model_get_path( model, &iter ); GtkTreePath* path = gtk_tree_model_get_path( model, &iter );
gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path ); gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path );
if ( GTK_WIDGET_REALIZED( view ) ) { if ( gtk_widget_get_realized( GTK_WIDGET( view ) ) ) {
gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 ); gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 );
} }
gtk_tree_path_free( path ); gtk_tree_path_free( path );
@ -1404,7 +1404,7 @@ static gint EntityClassList_keypress( GtkWidget* widget, GdkEventKey* event, gpo
if ( toupper( text[0] ) == (int)code ) { if ( toupper( text[0] ) == (int)code ) {
GtkTreePath* path = gtk_tree_model_get_path( model, &iter ); GtkTreePath* path = gtk_tree_model_get_path( model, &iter );
gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path ); gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path );
if ( GTK_WIDGET_REALIZED( view ) ) { if ( gtk_widget_get_realized( GTK_WIDGET( view ) ) ) {
gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 ); gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 );
} }
gtk_tree_path_free( path ); gtk_tree_path_free( path );

2
radiant/mru.cpp
View File

@ -158,7 +158,7 @@ void MRU_Activate( std::size_t index ){
MRU_SetText( i, MRU_GetText( i + 1 ) ); MRU_SetText( i, MRU_GetText( i + 1 ) );
if ( MRU_used == 0 ) { if ( MRU_used == 0 ) {
gtk_label_set_text( GTK_LABEL( GTK_BIN( MRU_items[0] )->child ), "Recent Files" ); gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( MRU_items[0] ) ) ), "Recent Files" );
gtk_widget_set_sensitive( GTK_WIDGET( MRU_items[0] ), FALSE ); gtk_widget_set_sensitive( GTK_WIDGET( MRU_items[0] ), FALSE );
} }
else else

2
radiant/preferences.cpp
View File

@ -608,7 +608,7 @@ void PreferencesDialog_addSettingsPage( const PreferenceGroupCallback& callback
} }
void Widget_updateDependency( GtkWidget* self, GtkWidget* toggleButton ){ void Widget_updateDependency( GtkWidget* self, GtkWidget* toggleButton ){
gtk_widget_set_sensitive( self, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( toggleButton ) ) && GTK_WIDGET_IS_SENSITIVE( toggleButton ) ); gtk_widget_set_sensitive( self, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( toggleButton ) ) && gtk_widget_is_sensitive( toggleButton ) );
} }
void ToggleButton_toggled_Widget_updateDependency( GtkWidget *toggleButton, GtkWidget* self ){ void ToggleButton_toggled_Widget_updateDependency( GtkWidget *toggleButton, GtkWidget* self ){

5
radiant/surfacedialog.cpp
View File

@ -114,7 +114,7 @@ void queueDraw(){
inline void spin_button_set_step( GtkSpinButton* spin, gfloat step ){ inline void spin_button_set_step( GtkSpinButton* spin, gfloat step ){
#if 1 #if 1
gtk_spin_button_get_adjustment( spin )->step_increment = step; gtk_adjustment_set_step_increment( gtk_spin_button_get_adjustment( spin ), step );
#else #else
GValue gvalue = GValue_default(); GValue gvalue = GValue_default();
g_value_init( &gvalue, G_TYPE_DOUBLE ); g_value_init( &gvalue, G_TYPE_DOUBLE );
@ -1294,8 +1294,7 @@ void spin_button_set_value_no_signal( GtkSpinButton* spin, gdouble value ){
} }
void spin_button_set_step_increment( GtkSpinButton* spin, gdouble value ){ void spin_button_set_step_increment( GtkSpinButton* spin, gdouble value ){
GtkAdjustment* adjust = gtk_spin_button_get_adjustment( spin ); gtk_adjustment_set_step_increment( gtk_spin_button_get_adjustment( spin ), value );
adjust->step_increment = value;
} }
void SurfaceInspector::Update(){ void SurfaceInspector::Update(){

4
radiant/xywindow.cpp
View File

@ -917,7 +917,7 @@ void XYWnd::NewBrushDrag( int x, int y, bool square, bool cube ){
int g_entityCreationOffset = 0; int g_entityCreationOffset = 0;
void entitycreate_activated( GtkMenuItem* item, gpointer user_data ){ void entitycreate_activated( GtkMenuItem* item, gpointer user_data ){
const char* entity_name = gtk_label_get_text( GTK_LABEL( GTK_BIN( item )->child ) ); const char* entity_name = gtk_label_get_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( item ) ) ) );
if( g_bCamEntityMenu ){ if( g_bCamEntityMenu ){
const Vector3 viewvector = -Camera_getViewVector( *g_pParentWnd->GetCamWnd() ); const Vector3 viewvector = -Camera_getViewVector( *g_pParentWnd->GetCamWnd() );
const float offset_for_multiple = std::max( GetSnapGridSize(), 8.f ) * g_entityCreationOffset; const float offset_for_multiple = std::max( GetSnapGridSize(), 8.f ) * g_entityCreationOffset;
@ -934,7 +934,7 @@ void entitycreate_activated( GtkMenuItem* item, gpointer user_data ){
gboolean entitycreate_rightClicked( GtkWidget* widget, GdkEvent* event, gpointer user_data ) { gboolean entitycreate_rightClicked( GtkWidget* widget, GdkEvent* event, gpointer user_data ) {
/* convert entities */ /* convert entities */
if ( event->button.button == 3 ) { if ( event->button.button == 3 ) {
Scene_EntitySetClassname_Selected( gtk_label_get_text( GTK_LABEL( GTK_BIN( widget )->child ) ) ); Scene_EntitySetClassname_Selected( gtk_label_get_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( widget ) ) ) ) );
if( ( event->button.state & GDK_CONTROL_MASK ) == 0 ){ if( ( event->button.state & GDK_CONTROL_MASK ) == 0 ){
gtk_menu_popdown( XYWnd::m_mnuDrop ); gtk_menu_popdown( XYWnd::m_mnuDrop );
} }