X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff334106993280a241de09fef5f3749edb806c06..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/gtk1/toplevel.cpp diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp index a761214759..8c521b4282 100644 --- a/src/gtk1/toplevel.cpp +++ b/src/gtk1/toplevel.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: toplevel.cpp +// Name: src/gtk1/toplevel.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -15,10 +15,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "toplevel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,7 +30,7 @@ #include "wx/control.h" #include "wx/app.h" #include "wx/dcclient.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include "wx/timer.h" #include "wx/settings.h" #include "wx/evtloop.h" @@ -45,7 +41,7 @@ #include #include -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" #include "wx/unix/utilsx11.h" @@ -105,17 +101,11 @@ static void wxgtk_window_set_urgency_hint (GtkWindow *win, XFree(wm_hints); } -static gint gtk_frame_urgency_timer_callback( GtkWidget *win ) +static gint gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win ) { -#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE); - else -#endif - wxgtk_window_set_urgency_hint(GTK_WINDOW( win ), FALSE); + wxgtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE); - //BCI: argument from GtkWidget* to wxTopLevelWindowGTK* && win->m_urgency_hint = -2; - gtk_object_set_data(GTK_OBJECT(win), "m_urgency_hint", GINT_TO_POINTER(-2)); + win->m_urgency_hint = -2; return FALSE; } } @@ -152,25 +142,15 @@ static gint gtk_frame_focus_in_callback( GtkWidget *widget, // wxPrintf( wxT("active: %s\n"), win->GetTitle().c_str() ); // MR: wxRequestUserAttention related block - //BCI: switch(win->m_urgency_hint) - switch( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) ) + switch( win->m_urgency_hint ) { default: - //BCI: - gtk_timeout_remove( GPOINTER_TO_INT(gtk_object_get_data( GTK_OBJECT(widget), "m_urgency_hint") ) ); + gtk_timeout_remove( win->m_urgency_hint ); // no break, fallthrough to remove hint too case -1: -#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); - else -#endif - { - wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); - } + wxgtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE); - //BCI: win->m_urgency_hint = -2; - gtk_object_set_data( GTK_OBJECT(widget), "m_urgency_hint", GINT_TO_POINTER(-2) ); + win->m_urgency_hint = -2; break; case -2: break; @@ -379,7 +359,7 @@ gtk_frame_unmap_callback( GtkWidget * WXUNUSED(widget), GdkEvent * WXUNUSED(event), wxTopLevelWindow *win ) { - win->SetIconizeState(TRUE); + win->SetIconizeState(true); } } @@ -408,8 +388,6 @@ static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_ev // "draw" of m_client //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ - extern "C" { static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxWindow *win ) { @@ -425,8 +403,6 @@ static void gtk_window_draw_callback( GtkWidget *widget, GdkRectangle *rect, wxW } } -#endif // GTK+ 1.x - // ---------------------------------------------------------------------------- // wxTopLevelWindowGTK itself // ---------------------------------------------------------------------------- @@ -487,12 +463,7 @@ void wxTopLevelWindowGTK::Init() m_gdkDecor = m_gdkFunc = 0; m_grabbed = false; - //BCI: header wx/gtk/toplevel.h: - // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and - // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. - // int m_urgency_hint; - - //BCI: m_urgency_hint = -2; + m_urgency_hint = -2; } bool wxTopLevelWindowGTK::Create( wxWindow *parent, @@ -530,17 +501,7 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, { if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) { -#ifdef __WXGTK20__ - m_widget = gtk_window_new(GTK_WINDOW_TOPLEVEL); - // Tell WM that this is a dialog window and make it center - // on parent by default (this is what GtkDialog ctor does): - gtk_window_set_type_hint(GTK_WINDOW(m_widget), - GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_position(GTK_WINDOW(m_widget), - GTK_WIN_POS_CENTER_ON_PARENT); -#else m_widget = gtk_window_new(GTK_WINDOW_DIALOG); -#endif } else { @@ -566,9 +527,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, } } - // BCI: - gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2) ); - wxWindow *topParent = wxGetTopLevelParent(m_parent); if (topParent && (((GTK_IS_WINDOW(topParent->m_widget)) && (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG)) || @@ -578,26 +536,6 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, GTK_WINDOW(topParent->m_widget) ); } -#if GTK_CHECK_VERSION(2,2,0) - if (!gtk_check_version(2,2,0)) - { - if (style & wxFRAME_NO_TASKBAR) - { - gtk_window_set_skip_taskbar_hint(GTK_WINDOW(m_widget), TRUE); - } - } -#endif - -#if GTK_CHECK_VERSION(2,4,0) - if (!gtk_check_version(2,4,0)) - { - if (style & wxSTAY_ON_TOP) - { - gtk_window_set_keep_above(GTK_WINDOW(m_widget), TRUE); - } - } -#endif - if (!name.empty()) gtk_window_set_wmclass( GTK_WINDOW(m_widget), wxGTK_CONV( name ), wxGTK_CONV( name ) ); @@ -618,10 +556,8 @@ bool wxTopLevelWindowGTK::Create( wxWindow *parent, // For m_mainWidget themes gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event", GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this ); -#ifndef __WXGTK20__ gtk_signal_connect( GTK_OBJECT(m_mainWidget), "draw", GTK_SIGNAL_FUNC(gtk_window_draw_callback), (gpointer)this ); -#endif } // m_wxwindow only represents the client area without toolbar and menubar @@ -720,7 +656,7 @@ wxTopLevelWindowGTK::~wxTopLevelWindowGTK() { if (m_grabbed) { - wxASSERT_MSG( FALSE, _T("Window still grabbed")); + wxASSERT_MSG( false, _T("Window still grabbed")); RemoveGrab(); } @@ -857,11 +793,7 @@ bool wxTopLevelWindowGTK::Show( bool show ) void wxTopLevelWindowGTK::Raise() { -#ifdef __WXGTK20__ - gtk_window_present( GTK_WINDOW( m_widget ) ); -#else wxWindow::Raise(); -#endif } void wxTopLevelWindowGTK::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) ) @@ -1146,7 +1078,11 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title ) { wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") ); + if ( title == m_title ) + return; + m_title = title; + gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) ); } @@ -1161,21 +1097,6 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons ) wxTopLevelWindowBase::SetIcons( icons ); -#ifdef __WXGTK20__ - GList *list = NULL; - size_t max = icons.m_icons.GetCount(); - - for (size_t i = 0; i < max; i++) - { - if (icons.m_icons[i].Ok()) - { - list = g_list_prepend(list, icons.m_icons[i].GetPixbuf()); - } - } - gtk_window_set_icon_list(GTK_WINDOW(m_widget), list); - g_list_free(list); - -#else // !__WXGTK20__ GdkWindow* window = m_widget->window; if (!window) return; @@ -1192,7 +1113,6 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons ) wxSetIconsX11( (WXDisplay*)GDK_WINDOW_XDISPLAY( window ), (WXWindow)GDK_WINDOW_XWINDOW( window ), icons ); -#endif // !__WXGTK20__ } // ---------------------------------------------------------------------------- @@ -1201,49 +1121,24 @@ void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons ) void wxTopLevelWindowGTK::Maximize(bool maximize) { -#ifdef __WXGTK20__ - if (maximize) - gtk_window_maximize( GTK_WINDOW( m_widget ) ); - else - gtk_window_unmaximize( GTK_WINDOW( m_widget ) ); -#else wxFAIL_MSG( _T("not implemented") ); -#endif } bool wxTopLevelWindowGTK::IsMaximized() const { -#ifdef __WXGTK20__ - if(!m_widget->window) - return false; - - return gdk_window_get_state(m_widget->window) & GDK_WINDOW_STATE_MAXIMIZED; -#else // wxFAIL_MSG( _T("not implemented") ); // This is an approximation return false; -#endif } void wxTopLevelWindowGTK::Restore() { -#ifdef __WXGTK20__ - // "Present" seems similar enough to "restore" - gtk_window_present( GTK_WINDOW( m_widget ) ); -#else wxFAIL_MSG( _T("not implemented") ); -#endif } void wxTopLevelWindowGTK::Iconize( bool iconize ) { -#ifdef __WXGTK20__ - if (iconize) - gtk_window_iconify( GTK_WINDOW( m_widget ) ); - else - gtk_window_deiconify( GTK_WINDOW( m_widget ) ); -#else if (iconize) { GdkWindow *window = m_widget->window; @@ -1255,7 +1150,6 @@ void wxTopLevelWindowGTK::Iconize( bool iconize ) GDK_WINDOW_XWINDOW( window ), DefaultScreen( GDK_DISPLAY() ) ); } -#endif } bool wxTopLevelWindowGTK::IsIconized() const @@ -1304,14 +1198,10 @@ static bool do_shape_combine_region(GdkWindow* window, const wxRegion& region) } else { -#ifdef __WXGTK20__ - gdk_window_shape_combine_region(window, region.GetRegion(), 0, 0); -#else wxBitmap bmp = region.ConvertToBitmap(); bmp.SetMask(new wxMask(bmp, *wxBLACK)); GdkBitmap* mask = bmp.GetMask()->GetBitmap(); gdk_window_shape_combine_mask(window, mask, 0, 0); -#endif return true; } } @@ -1349,17 +1239,10 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) // wxYieldIfNeeded ensures the processing of it, but can have unwanted side effects - MR ::wxYieldIfNeeded(); - /*BCI: if(m_urgency_hint >= 0) gtk_timeout_remove(m_urgency_hint); - */ - int urgency_hint = GPOINTER_TO_INT( gtk_object_get_data( GTK_OBJECT(m_widget), "m_urgency_hint") ); - if(urgency_hint >= 0) - gtk_timeout_remove(urgency_hint); - //BCI: END - //BCI: m_urgency_hint = -2; - gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-2)); + m_urgency_hint = -2; if( GTK_WIDGET_REALIZED(m_widget) && !IsActive() ) { @@ -1367,21 +1250,18 @@ void wxTopLevelWindowGTK::RequestUserAttention(int flags) if (flags & wxUSER_ATTENTION_INFO) { - //BCI: m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this); - gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", - GINT_TO_POINTER( gtk_timeout_add(5000, - (GtkFunction)gtk_frame_urgency_timer_callback, - m_widget) ) ); + m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this); } else { - //BCI: m_urgency_hint = -1; - gtk_object_set_data( GTK_OBJECT(m_widget), "m_urgency_hint", GINT_TO_POINTER(-1) ); + m_urgency_hint = -1; } } -#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0) - if(!gtk_check_version(2,7,0)) - gtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value); - else -#endif - wxgtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value); + wxgtk_window_set_urgency_hint(GTK_WINDOW( m_widget ), new_hint_value); +} + +void wxTopLevelWindowGTK::SetWindowStyleFlag( long style ) +{ + // Process wxWindow styles. This also updates the internal variable + // Therefore m_windowStyle bits carry now the _new_ style values + wxWindow::SetWindowStyleFlag(style); }