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

gtk_widget_ref/gtk_widget_unref -> g_object_ref/g_object_unref

Browse Source
This commit is contained in:
Garux 2020-05-21 14:16:41 +03:00
parent e8998ab4a8
commit 70cf8c4bdd
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/brushexport/interface.cpp
View File

@ -8,7 +8,7 @@
#define GLADE_HOOKUP_OBJECT( component,widget,name ) \
g_object_set_data_full( G_OBJECT( component ), name, \
gtk_widget_ref( widget ), (GDestroyNotify) gtk_widget_unref )
g_object_ref( (gpointer)widget ), (GDestroyNotify) g_object_unref )
#define GLADE_HOOKUP_OBJECT_NO_REF( component,widget,name ) \
g_object_set_data( G_OBJECT( component ), name, widget )

4
libs/gtkutil/glwidget.cpp
View File

@ -187,7 +187,7 @@ GtkWidget* g_shared = 0;
gint glwidget_context_created( GtkWidget* widget, gpointer data ){
if ( ++g_context_count == 1 ) {
g_shared = widget;
gtk_widget_ref( g_shared );
g_object_ref( G_OBJECT( g_shared ) );
glwidget_make_current( g_shared );
GlobalOpenGL().contextValid = true;
@ -203,7 +203,7 @@ gint glwidget_context_destroyed( GtkWidget* widget, gpointer data ){
GLWidget_sharedContextDestroyed();
gtk_widget_unref( g_shared );
g_object_unref( G_OBJECT( g_shared ) );
g_shared = 0;
}
return FALSE;

4
radiant/camwindow.cpp
View File

@ -1695,7 +1695,7 @@ CamWnd::CamWnd() :
m_window_observer->setRectangleDrawCallback( ReferenceCaller1<CamWnd, rect_t, camwnd_update_xor_rectangle>( *this ) );
m_window_observer->setView( m_view );
gtk_widget_ref( m_gl_widget );
g_object_ref( G_OBJECT( m_gl_widget ) );
gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
gtk_widget_set_can_focus( m_gl_widget, TRUE );
@ -1726,7 +1726,7 @@ CamWnd::~CamWnd(){
g_signal_handler_disconnect( G_OBJECT( m_gl_widget ), m_sizeHandler );
g_signal_handler_disconnect( G_OBJECT( m_gl_widget ), m_exposeHandler );
gtk_widget_unref( m_gl_widget );
g_object_unref( G_OBJECT( m_gl_widget ) );
delete m_fbo;

6
radiant/entityinspector.cpp
View File

@ -1022,7 +1022,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
GtkWidget* widget = GTK_WIDGET( g_entitySpawnflagsCheck[i] );
gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( widget ) ) ), " " );
gtk_widget_hide( widget );
gtk_widget_ref( widget );
g_object_ref( G_OBJECT( widget ) );
gtk_container_remove( GTK_CONTAINER( g_spawnflagsTable ), widget );
}
}
@ -1041,7 +1041,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){
gtk_table_attach( g_spawnflagsTable, widget, i % 4, i % 4 + 1, i / 4, i / 4 + 1,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( GTK_FILL ), 0, 0 );
gtk_widget_unref( widget );
g_object_unref( G_OBJECT( widget ) );
gtk_label_set_text( GTK_LABEL( gtk_bin_get_child( GTK_BIN( widget ) ) ), str.c_str() );
@ -1612,7 +1612,7 @@ GtkWidget* EntityInspector_constructWindow( GtkWindow* toplevel ){
for ( int i = 0; i < MAX_FLAGS; i++ )
{
GtkCheckButton* check = GTK_CHECK_BUTTON( gtk_check_button_new_with_label( "" ) );
gtk_widget_ref( GTK_WIDGET( check ) );
g_object_ref( G_OBJECT( check ) );
g_object_set_data( G_OBJECT( check ), "handler", gint_to_pointer( g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( SpawnflagCheck_toggled ), 0 ) ) );
g_entitySpawnflagsCheck[i] = check;
}

2
radiant/gtktheme.cpp
View File

@ -107,7 +107,7 @@ void on_main_ok_button_clicked( GtkButton* button, gpointer user_data ) {
#define GLADE_HOOKUP_OBJECT( component, widget, name ) \
g_object_set_data_full( G_OBJECT( component ), name, \
gtk_widget_ref( widget ), (GDestroyNotify)gtk_widget_unref )
g_object_ref( (gpointer)widget ), (GDestroyNotify)g_object_unref )
#define GLADE_HOOKUP_OBJECT_NO_REF( component, widget, name ) \
g_object_set_data( G_OBJECT( component ), name, widget )

4
radiant/modelwindow.cpp
View File

@ -1318,7 +1318,7 @@ GtkWidget* ModelBrowser_constructWindow( GtkWindow* toplevel ){
}
{ // gl_widget
GtkWidget* w = g_ModelBrowser.m_gl_widget = glwidget_new( TRUE );
gtk_widget_ref( w );
g_object_ref( G_OBJECT( w ) );
gtk_widget_set_events( w, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
gtk_widget_set_can_focus( w, TRUE );
@ -1344,7 +1344,7 @@ void ModelBrowser_destroyWindow(){
g_signal_handler_disconnect( G_OBJECT( g_ModelBrowser.m_gl_widget ), g_ModelBrowser.m_sizeHandler );
g_signal_handler_disconnect( G_OBJECT( g_ModelBrowser.m_gl_widget ), g_ModelBrowser.m_exposeHandler );
gtk_widget_unref( g_ModelBrowser.m_gl_widget );
g_object_unref( G_OBJECT( g_ModelBrowser.m_gl_widget ) );
g_ModelBrowser.m_gl_widget = nullptr;
delete g_ModelBrowser.m_fbo;

2
radiant/surfacedialog.cpp
View File

@ -1225,7 +1225,7 @@ GtkWindow* SurfaceInspector::BuildDialog(){
//Prolly should make this a member or global var, so the SI can draw on it...
TexTool::g_textoolWin = glwidget_new( FALSE );
// --> Dunno, but this stuff may be necessary... (Looks like it!)
gtk_widget_ref( TexTool::g_textoolWin );
g_object_ref( G_OBJECT( TexTool::g_textoolWin ) );
gtk_widget_set_events( TexTool::g_textoolWin, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK );
gtk_widget_set_can_focus( TexTool::g_textoolWin, TRUE );
// <-- end stuff...

4
radiant/texwindow.cpp
View File

@ -2147,7 +2147,7 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
#else
GtkWidget* w = g_TextureBrowser.m_gl_widget = glwidget_new( FALSE );
#endif
gtk_widget_ref( w );
g_object_ref( G_OBJECT( w ) );
gtk_widget_set_events( w, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
gtk_widget_set_can_focus( w, TRUE );
@ -2328,7 +2328,7 @@ void TextureBrowser_destroyWindow(){
g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler );
g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler );
gtk_widget_unref( g_TextureBrowser.m_gl_widget );
g_object_unref( G_OBJECT( g_TextureBrowser.m_gl_widget ) );
}
const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){

4
radiant/xywindow.cpp
View File

@ -711,7 +711,7 @@ XYWnd::XYWnd() :
m_window_observer->setRectangleDrawCallback( ReferenceCaller1<XYWnd, rect_t, xy_update_xor_rectangle>( *this ) );
m_window_observer->setView( m_view );
gtk_widget_ref( m_gl_widget );
g_object_ref( G_OBJECT( m_gl_widget ) );
gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK );
gtk_widget_set_can_focus( m_gl_widget, TRUE );
@ -752,7 +752,7 @@ XYWnd::~XYWnd(){
g_signal_handler_disconnect( G_OBJECT( m_gl_widget ), m_sizeHandler );
g_signal_handler_disconnect( G_OBJECT( m_gl_widget ), m_exposeHandler );
gtk_widget_unref( m_gl_widget );
g_object_unref( G_OBJECT( m_gl_widget ) );
m_window_observer->release();
}