diff --git a/contrib/camera/dialogs.cpp b/contrib/camera/dialogs.cpp index 4c60ec7f..0901aef6 100644 --- a/contrib/camera/dialogs.cpp +++ b/contrib/camera/dialogs.cpp @@ -943,7 +943,7 @@ static gint ci_add( GtkWidget *widget, gpointer data ){ } // Add the event - GetCurrentCam()->GetCam()->addEvent( static_cast( type ), str, (long)( g_pTimeLine->value ) ); + GetCurrentCam()->GetCam()->addEvent( static_cast( type ), str, (long)( gtk_adjustment_get_value( g_pTimeLine ) ) ); // Refresh event list RefreshEventList(); @@ -974,7 +974,7 @@ static gint ci_del( GtkWidget *widget, gpointer data ){ static gint ci_timeline_changed( GtkAdjustment *adjustment ){ char buf[128]; - sprintf( buf, "%.2f", adjustment->value / 1000.f ); + sprintf( buf, "%.2f", gtk_adjustment_get_value( adjustment ) / 1000.f ); gtk_label_set_text( g_pCurrentTime, buf ); // FIXME: this will never work completely perfect. Startcamera calls buildcamera, which sets all events to 'nottriggered'. @@ -986,7 +986,7 @@ static gint ci_timeline_changed( GtkAdjustment *adjustment ){ GetCurrentCam()->GetCam()->startCamera( 0 ); - GetCurrentCam()->GetCam()->getCameraInfo( (long)( adjustment->value ), &origin[0], &dir[0], &fov ); + GetCurrentCam()->GetCam()->getCameraInfo( (long)( gtk_adjustment_get_value( adjustment ) ), &origin[0], &dir[0], &fov ); VectorSet( angles, asin( dir[2] ) * 180 / 3.14159, atan2( dir[1], dir[0] ) * 180 / 3.14159, 0 ); g_CameraTable.m_pfnSetCamera( origin, angles ); } diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index bfaf9849..5784faa8 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -803,7 +803,7 @@ static void general_wave( GtkToggleButton *widget, gpointer data ){ } static void general_random( GtkAdjustment *adj, gpointer data ){ - int nPos = (int)adj->value; + int nPos = (int)gtk_adjustment_get_value( adj ); if ( RandomSeed != nPos ) { RandomSeed = nPos; @@ -831,7 +831,7 @@ static void extents_use_patches( GtkToggleButton *check, gpointer data ){ } static void extents_nhnv_spin( GtkAdjustment *adj, int *data ){ - int nPos = (int)adj->value; + int nPos = (int)gtk_adjustment_get_value( adj ); if ( *data != nPos ) { if ( Game == QUAKE3 && UsePatches && ( nPos % 2 ) ) { @@ -851,7 +851,7 @@ static void extents_nhnv_spin( GtkAdjustment *adj, int *data ){ } static void extents_decimate( GtkAdjustment *adj, gpointer data ){ - int nPos = (int)adj->value; + int nPos = (int)gtk_adjustment_get_value( adj ); Decimate = nPos; UpdatePreview( true ); @@ -860,7 +860,7 @@ static void extents_decimate( GtkAdjustment *adj, gpointer data ){ // Hydra : snap to grid begin /*static void extents_snaptogrid (GtkAdjustment *adj, gpointer data) { - int nPos = (int)adj->value; + int nPos = (int)gtk_adjustment_get_value( adj ); SnapToGrid = nPos; UpdatePreview (true); @@ -868,7 +868,7 @@ static void extents_decimate( GtkAdjustment *adj, gpointer data ){ // ^Fishman - Modified version of Hydra's snap to grid code. static void extents_snaptogrid_spin( GtkAdjustment *adj, int *data ){ - int nPos = (int)adj->value; + int nPos = (int)gtk_adjustment_get_value( adj ); SnapToGrid = nPos; UpdatePreview( true ); } @@ -948,7 +948,7 @@ static gint fix_value_entryfocusout( GtkWidget* widget, GdkEventFocus *event, gp } static void fix_value_changed( GtkAdjustment *adj, gpointer data ){ - int k, i = (int)adj->value; + int k, i = (int)gtk_adjustment_get_value( adj ); if ( xyz[Vertex[0].i][Vertex[0].j].fixed_value != i ) { for ( k = 0; k < NumVerticesSelected; k++ ) diff --git a/contrib/gtkgensurf/view.cpp b/contrib/gtkgensurf/view.cpp index 8d8460a4..e1e94e17 100644 --- a/contrib/gtkgensurf/view.cpp +++ b/contrib/gtkgensurf/view.cpp @@ -358,7 +358,7 @@ static gint doublevariable_spinfocusout( GtkWidget* widget, GdkEventFocus* event } static void preview_spin( GtkAdjustment *adj, double *data ){ - *data = DegreesToRadians( adj->value ); + *data = DegreesToRadians( gtk_adjustment_get_value( adj ) ); UpdatePreview( false ); } diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp index 63080a2b..6c95b47c 100644 --- a/contrib/prtview/ConfigDialog.cpp +++ b/contrib/prtview/ConfigDialog.cpp @@ -128,7 +128,7 @@ static void SetClipText( GtkWidget* label ){ } static void OnScroll2d( GtkAdjustment *adj, gpointer data ){ - portals.width_2d = static_cast( adj->value ); + portals.width_2d = static_cast( gtk_adjustment_get_value( adj ) ); Set2DText( GTK_WIDGET( data ) ); Portals_shadersChanged(); @@ -136,21 +136,21 @@ static void OnScroll2d( GtkAdjustment *adj, gpointer data ){ } static void OnScroll3d( GtkAdjustment *adj, gpointer data ){ - portals.width_3d = static_cast( adj->value ); + portals.width_3d = static_cast( gtk_adjustment_get_value( adj ) ); Set3DText( GTK_WIDGET( data ) ); SceneChangeNotify(); } static void OnScrollTrans( GtkAdjustment *adj, gpointer data ){ - portals.trans_3d = static_cast( adj->value ); + portals.trans_3d = static_cast( gtk_adjustment_get_value( adj ) ); Set3DTransText( GTK_WIDGET( data ) ); SceneChangeNotify(); } static void OnScrollClip( GtkAdjustment *adj, gpointer data ){ - portals.clip_range = static_cast( adj->value ); + portals.clip_range = static_cast( gtk_adjustment_get_value( adj ) ); SetClipText( GTK_WIDGET( data ) ); SceneChangeNotify(); diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h index 2ddfb658..1c70a1d7 100644 --- a/libs/gtkutil/cursor.h +++ b/libs/gtkutil/cursor.h @@ -269,7 +269,7 @@ void value_changed( gdouble value ){ } } static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustment* self ){ - self->value_changed( adjustment->value ); + self->value_changed( gtk_adjustment_get_value( adjustment ) ); } }; diff --git a/radiant/modelwindow.cpp b/radiant/modelwindow.cpp index 73f82795..91e279ec 100644 --- a/radiant/modelwindow.cpp +++ b/radiant/modelwindow.cpp @@ -565,12 +565,12 @@ private: void updateScroll() const { GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( m_gl_scroll ) ); - vadjustment->value = -m_originZ; - vadjustment->page_size = m_height; - vadjustment->page_increment = m_height / 2; - vadjustment->step_increment = 20; - vadjustment->lower = 0; - vadjustment->upper = totalHeight(); + gtk_adjustment_set_value( vadjustment, -m_originZ ); + gtk_adjustment_set_page_size( vadjustment, m_height ); + gtk_adjustment_set_page_increment( vadjustment, m_height / 2 ); + gtk_adjustment_set_step_increment( vadjustment, 20 ); + gtk_adjustment_set_lower( vadjustment, 0 ); + gtk_adjustment_set_upper( vadjustment, totalHeight() ); g_signal_emit_by_name( G_OBJECT( vadjustment ), "changed" ); } @@ -996,7 +996,7 @@ void ModelBrowser_scrollChanged( void* data, gdouble value ){ } static void ModelBrowser_scrollbarScroll( GtkAdjustment *adjustment, ModelBrowser* modelBrowser ){ - modelBrowser->m_scrollAdjustment.value_changed( adjustment->value ); + modelBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value( adjustment ) ); } diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index d7dbafbf..963e3def 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -462,14 +462,14 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ td.scale[0] = td.scale[1] = 0; td.shift[0] = td.shift[1] = 0; - if ( adj->value == 0 ) { + if ( gtk_adjustment_get_value( adj ) == 0 ) { return; } if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "hshift_adj" ) ) { g_pi_globals.shift[0] = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) ); - if ( adj->value > 0 ) { + if ( gtk_adjustment_get_value( adj ) > 0 ) { td.shift[0] = g_pi_globals.shift[0]; } else{ @@ -479,7 +479,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ else if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "vshift_adj" ) ) { g_pi_globals.shift[1] = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) ); - if ( adj->value > 0 ) { + if ( gtk_adjustment_get_value( adj ) > 0 ) { td.shift[1] = g_pi_globals.shift[1]; } else{ @@ -491,7 +491,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ if ( g_pi_globals.scale[0] == 0.0f ) { return; } - if ( adj->value > 0 ) { + if ( gtk_adjustment_get_value( adj ) > 0 ) { td.scale[0] = g_pi_globals.scale[0]; } else{ @@ -503,7 +503,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ if ( g_pi_globals.scale[1] == 0.0f ) { return; } - if ( adj->value > 0 ) { + if ( gtk_adjustment_get_value( adj ) > 0 ) { td.scale[1] = g_pi_globals.scale[1]; } else{ @@ -513,7 +513,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ else if ( adj == g_object_get_data( G_OBJECT( g_PatchInspector.GetWidget() ), "rotate_adj" ) ) { g_pi_globals.rotate = static_cast( atof( gtk_entry_get_text( GTK_ENTRY( data ) ) ) ); - if ( adj->value > 0 ) { + if ( gtk_adjustment_get_value( adj ) > 0 ) { td.rotate = g_pi_globals.rotate; } else{ @@ -521,7 +521,7 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ } } - adj->value = 0; + gtk_adjustment_set_value( adj, 0 ); // will scale shift rotate the patch accordingly diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index a2c62b0b..033bed77 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1395,7 +1395,7 @@ void TextureBrowser_scrollChanged( void* data, gdouble value ){ } static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){ - textureBrowser->m_scrollAdjustment.value_changed( adjustment->value ); + textureBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value( adjustment ) ); } void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){ @@ -1406,12 +1406,12 @@ void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){ GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); - vadjustment->value = -TextureBrowser_getOriginY( textureBrowser ); - vadjustment->page_size = textureBrowser.height; - vadjustment->page_increment = textureBrowser.height / 2; - vadjustment->step_increment = 20; - vadjustment->lower = 0; - vadjustment->upper = totalHeight; + gtk_adjustment_set_value( vadjustment, -TextureBrowser_getOriginY( textureBrowser ) ); + gtk_adjustment_set_page_size( vadjustment, textureBrowser.height ); + gtk_adjustment_set_page_increment( vadjustment, textureBrowser.height / 2 ); + gtk_adjustment_set_step_increment( vadjustment, 20 ); + gtk_adjustment_set_lower( vadjustment, 0 ); + gtk_adjustment_set_upper( vadjustment, totalHeight ); g_signal_emit_by_name( G_OBJECT( vadjustment ), "changed" ); }