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

use gtk_widget_get_window() instead of widget->window

Browse Source
This commit is contained in:
Garux 2020-05-20 00:05:49 +03:00
parent ff33df7d45
commit 12263f74d1
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/gtkgensurf/view.cpp
View File

@ -308,7 +308,7 @@ static void motion( GtkWidget *widget, GdkEventMotion *event, gpointer data ){
if ( PtInRect( &rcGrid,pt ) ) {
GdkCursor *cursor = gdk_cursor_new( GDK_CROSS );
gdk_window_set_cursor( g_pWndPreview->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( g_pWndPreview ), cursor );
gdk_cursor_unref( cursor );
char Text[32];
@ -334,7 +334,7 @@ static void motion( GtkWidget *widget, GdkEventMotion *event, gpointer data ){
}
else
{
gdk_window_set_cursor( g_pWndPreview->window, NULL );
gdk_window_set_cursor( gtk_widget_get_window( g_pWndPreview ), NULL );
}
g_UIGtkTable.m_pfn_glwidget_swap_buffers( g_pPreviewWidget );

4
contrib/meshtex/GenericDialog.cpp
View File

@ -100,7 +100,7 @@ GenericDialog::Raise()
// Don't bother if not visible.
if (gtk_widget_get_visible(_dialog))
{
gdk_window_raise(_dialog->window);
gdk_window_raise(gtk_widget_get_window( _dialog ));
}
}
@ -142,7 +142,7 @@ GenericDialog::Hide()
{
return;
}
gdk_window_raise(_window->window);
gdk_window_raise(gtk_widget_get_window(_window));
}
/**

4
libs/gtkutil/cursor.cpp
View File

@ -46,12 +46,12 @@ GdkCursor* create_blank_cursor(){
void blank_cursor( GtkWidget* widget ){
GdkCursor* cursor = create_blank_cursor();
gdk_window_set_cursor( widget->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( widget ), cursor );
gdk_cursor_unref( cursor );
}
void default_cursor( GtkWidget* widget ){
gdk_window_set_cursor( widget->window, 0 );
gdk_window_set_cursor( gtk_widget_get_window( widget ), 0 );
}
#endif

8
libs/gtkutil/cursor.h
View File

@ -182,8 +182,8 @@ void freeze_pointer( GtkWindow* window, GtkWidget* widget, MotionDeltaFunction f
//GdkGrabStatus status =
/* fixes cursor runaways during srsly quick drags in camera
drags with pressed buttons have no problem at all w/o this */
gdk_pointer_grab( GTK_WIDGET( window )->window, TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
//gdk_window_set_cursor ( GTK_WIDGET( window )->window, cursor );
gdk_pointer_grab( gtk_widget_get_window( GTK_WIDGET( window ) ), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
//gdk_window_set_cursor ( gtk_widget_get_window( GTK_WIDGET( window ) ), cursor );
/* is needed to fix activating neighbor widgets, that happens, if using upper one */
gtk_grab_add( widget );
@ -192,7 +192,7 @@ void freeze_pointer( GtkWindow* window, GtkWidget* widget, MotionDeltaFunction f
Sys_GetCursorPos( window, &recorded_x, &recorded_y );
/* using center for tracking for max safety */
gdk_window_get_origin( widget->window, &center_x, &center_y );
gdk_window_get_origin( gtk_widget_get_window( widget ), &center_x, &center_y );
center_y += widget->allocation.height / 2;
center_x += widget->allocation.width / 2;
@ -224,7 +224,7 @@ void unfreeze_pointer( bool centerize ){
else{
Sys_SetCursorPos( m_window, recorded_x, recorded_y );
}
// gdk_window_set_cursor( GTK_WIDGET( m_window )->window, 0 );
// gdk_window_set_cursor( gtk_widget_get_window( GTK_WIDGET( m_window ) ), 0 );
gdk_pointer_ungrab( GDK_CURRENT_TIME );
gtk_grab_remove( m_widget );

4
libs/gtkutil/window.cpp
View File

@ -123,7 +123,7 @@ void destroy_floating_window( GtkWindow* window ){
}
gint window_realize_remove_sysmenu( GtkWidget* widget, gpointer data ){
gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU ) );
gdk_window_set_decorations( gtk_widget_get_window( widget ), (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU ) );
return FALSE;
}
@ -150,7 +150,7 @@ GtkWindow* create_persistent_floating_window( const char* title, GtkWindow* main
}
gint window_realize_remove_minmax( GtkWidget* widget, gpointer data ){
gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
gdk_window_set_decorations( gtk_widget_get_window( widget ), (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
return FALSE;
}

4
radiant/clippertool.cpp
View File

@ -98,11 +98,11 @@ void Clipper_modeChanged( bool isClipper ){
if( g_pParentWnd ){
g_pParentWnd->forEachXYWnd( [&cursor]( XYWnd* xywnd ){
gdk_window_set_cursor( xywnd->GetWidget()->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( xywnd->GetWidget() ), cursor );
} );
if( g_pParentWnd->GetCamWnd() )
if( !isClipper || gdk_pointer_is_grabbed() == FALSE ) /* prevent cursor change `GDK_BLANK_CURSOR->g_clipper_cursor` during freelook */
gdk_window_set_cursor( CamWnd_getWidget( *g_pParentWnd->GetCamWnd() )->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( CamWnd_getWidget( *g_pParentWnd->GetCamWnd() ) ), cursor );
}
if( g_clipper_resetFlip )

2
radiant/gtkdlgs.cpp
View File

@ -1091,7 +1091,7 @@ void DoShaderView( const char *shaderFileName, const char *shaderName, bool exte
else if( external_editor && pathIsDir ){
if( g_TextEditor_editorCommand.empty() ){
#ifdef WIN32
ShellExecute( (HWND)GDK_WINDOW_HWND( GTK_WIDGET( MainFrame_getWindow() )->window ), 0, pathFull.c_str(), 0, 0, SW_SHOWNORMAL );
ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( GTK_WIDGET( MainFrame_getWindow() ) ) ), 0, pathFull.c_str(), 0, 0, SW_SHOWNORMAL );
#else
globalWarningStream() << "Failed to open '" << pathFull.c_str() << "'\nSet Shader Editor Command in preferences\n";
#endif

18
radiant/mainframe.cpp
View File

@ -1833,7 +1833,7 @@ void EverySecondTimer_disable(){
}
gint window_realize_remove_decoration( GtkWidget* widget, gpointer data ){
gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
gdk_window_set_decorations( gtk_widget_get_window( widget ), (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
return FALSE;
}
@ -2832,9 +2832,9 @@ void MainFrame::SetActiveXY( XYWnd* p ){
void MainFrame_toggleFullscreen(){
GtkWindow* wnd = MainFrame_getWindow();
if( gdk_window_get_state( GTK_WIDGET( wnd )->window ) & GDK_WINDOW_STATE_FULLSCREEN ){
if( gdk_window_get_state( gtk_widget_get_window( GTK_WIDGET( wnd ) ) ) & GDK_WINDOW_STATE_FULLSCREEN ){
//some portion of buttsex, because gtk_window_unfullscreen doesn't work correctly after calling some modal window
bool maximized = ( gdk_window_get_state( GTK_WIDGET( wnd )->window ) & GDK_WINDOW_STATE_MAXIMIZED );
bool maximized = ( gdk_window_get_state( gtk_widget_get_window( GTK_WIDGET( wnd ) ) ) & GDK_WINDOW_STATE_MAXIMIZED );
gtk_window_unfullscreen( wnd );
if( maximized ){
gtk_window_unmaximize( wnd );
@ -2881,9 +2881,9 @@ private:
m_hSplitPos = gtk_paned_get_position( GTK_PANED( g_pParentWnd->m_hSplit ) );
int vSplitX, vSplitY, vSplit2X, vSplit2Y, hSplitX, hSplitY;
gdk_window_get_origin( g_pParentWnd->m_vSplit->window, &vSplitX, &vSplitY );
gdk_window_get_origin( g_pParentWnd->m_vSplit2->window, &vSplit2X, &vSplit2Y );
gdk_window_get_origin( g_pParentWnd->m_hSplit->window, &hSplitX, &hSplitY );
gdk_window_get_origin( gtk_widget_get_window( g_pParentWnd->m_vSplit ), &vSplitX, &vSplitY );
gdk_window_get_origin( gtk_widget_get_window( g_pParentWnd->m_vSplit2 ), &vSplit2X, &vSplit2Y );
gdk_window_get_origin( gtk_widget_get_window( g_pParentWnd->m_hSplit ), &hSplitX, &hSplitY );
vSplitY += m_vSplitPos;
vSplit2Y += m_vSplit2Pos;
@ -3357,7 +3357,7 @@ void MainFrame::Create(){
void MainFrame::SaveWindowInfo(){
//restore good state first
if( gdk_window_get_state( GTK_WIDGET( m_window )->window ) & GDK_WINDOW_STATE_ICONIFIED ){
if( gdk_window_get_state( gtk_widget_get_window( GTK_WIDGET( m_window ) ) ) & GDK_WINDOW_STATE_ICONIFIED ){
gtk_window_deiconify( m_window );
}
if( g_maximizeview.isMaximized() ){
@ -3378,11 +3378,11 @@ void MainFrame::SaveWindowInfo(){
g_layout_globals.nCamHeight = gtk_paned_get_position( GTK_PANED( m_vSplit2 ) );
}
if( gdk_window_get_state( GTK_WIDGET( m_window )->window ) == 0 ){
if( gdk_window_get_state( gtk_widget_get_window( GTK_WIDGET( m_window ) ) ) == 0 ){
g_layout_globals.m_position = m_position_tracker.getPosition();
}
g_layout_globals.nState = gdk_window_get_state( GTK_WIDGET( m_window )->window );
g_layout_globals.nState = gdk_window_get_state( gtk_widget_get_window( GTK_WIDGET( m_window ) ) );
}
void MainFrame::Shutdown(){

4
radiant/qe3.cpp
View File

@ -356,14 +356,14 @@ bool g_bWaitCursor = false;
void Sys_BeginWait( void ){
ScreenUpdates_Disable( "Processing...", "Please Wait" );
GdkCursor *cursor = gdk_cursor_new( GDK_WATCH );
gdk_window_set_cursor( GTK_WIDGET( MainFrame_getWindow() )->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( GTK_WIDGET( MainFrame_getWindow() ) ), cursor );
gdk_cursor_unref( cursor );
g_bWaitCursor = true;
}
void Sys_EndWait( void ){
ScreenUpdates_Enable();
gdk_window_set_cursor( GTK_WIDGET( MainFrame_getWindow() )->window, 0 );
gdk_window_set_cursor( gtk_widget_get_window( GTK_WIDGET( MainFrame_getWindow() ) ), 0 );
g_bWaitCursor = false;
}

2
radiant/url.cpp
View File

@ -28,7 +28,7 @@
#include <gdk/gdkwin32.h>
#include <shellapi.h>
bool open_url( const char* url ){
return ShellExecute( (HWND)GDK_WINDOW_HWND( GTK_WIDGET( MainFrame_getWindow() )->window ), "open", url, 0, 0, SW_SHOW ) > (HINSTANCE)32;
return ShellExecute( (HWND)GDK_WINDOW_HWND( gtk_widget_get_window( GTK_WIDGET( MainFrame_getWindow() ) ) ), "open", url, 0, 0, SW_SHOW ) > (HINSTANCE)32;
}
#endif