// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
// ============================================================================
// declarations
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
#ifdef __VMS
#define XIconifyWindow XICONIFYWINDOW
#endif
-#include "wx/defs.h"
-
#include "wx/toplevel.h"
-#include "wx/log.h"
-#include "wx/dialog.h"
-#include "wx/control.h"
-#include "wx/app.h"
-#include "wx/dcclient.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/log.h"
+ #include "wx/app.h"
+ #include "wx/dcclient.h"
+ #include "wx/dialog.h"
+ #include "wx/timer.h"
+ #include "wx/settings.h"
+ #include "wx/control.h"
+#endif
+
#include "wx/gtk/private.h"
-#include "wx/timer.h"
-#include "wx/settings.h"
#include "wx/evtloop.h"
#include <glib.h>
// XA_CARDINAL
#include <X11/Xatom.h>
-// ----------------------------------------------------------------------------
-// idle system
-// ----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
// ----------------------------------------------------------------------------
// data
// ----------------------------------------------------------------------------
-extern wxList wxPendingDelete;
-
extern int g_openDialogs;
extern wxWindowGTK *g_delayedFocus;
XFree(wm_hints);
}
-static gint gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
+static gboolean gtk_frame_urgency_timer_callback( wxTopLevelWindowGTK *win )
{
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
+#if GTK_CHECK_VERSION(2,7,0)
if(!gtk_check_version(2,7,0))
gtk_window_set_urgency_hint(GTK_WINDOW( win->m_widget ), FALSE);
else
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_frame_focus_in_callback( GtkWidget *widget,
+static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
GdkEvent *WXUNUSED(event),
wxTopLevelWindowGTK *win )
{
switch( win->m_urgency_hint )
{
default:
- gtk_timeout_remove( win->m_urgency_hint );
+ g_source_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)
if(!gtk_check_version(2,7,0))
gtk_window_set_urgency_hint(GTK_WINDOW( widget ), FALSE);
else
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_frame_focus_out_callback( GtkWidget *widget,
+static gboolean gtk_frame_focus_out_callback( GtkWidget *widget,
GdkEventFocus *WXUNUSED(gdk_event),
wxTopLevelWindowGTK *win )
{
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
+static gboolean gtk_frame_focus_callback( GtkWidget *widget, GtkDirectionType WXUNUSED(d), wxWindow *WXUNUSED(win) )
{
if (g_isIdle)
wxapp_install_idle_handler();
// This disables GTK's tab traversal
- gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "focus" );
+ g_signal_stop_emission_by_name (widget, "focus");
return TRUE;
}
}
//-----------------------------------------------------------------------------
extern "C" {
-static gint gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxTopLevelWindowGTK *win )
+static gboolean
+gtk_frame_delete_callback( GtkWidget *WXUNUSED(widget),
+ GdkEvent *WXUNUSED(event),
+ wxTopLevelWindowGTK *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
//-----------------------------------------------------------------------------
extern "C" {
-static gint
-gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxTopLevelWindowGTK *win )
+static gboolean
+gtk_frame_configure_callback( GtkWidget *WXUNUSED(widget),
+ GdkEventConfigure *WXUNUSED(event),
+ wxTopLevelWindowGTK *win )
{
if (g_isIdle)
wxapp_install_idle_handler();
// GTK's shrinking/growing policy
if ((win->m_gdkFunc & GDK_FUNC_RESIZE) == 0)
- gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
+ gtk_window_set_resizable(GTK_WINDOW(win->m_widget), FALSE);
else
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
//-----------------------------------------------------------------------------
extern "C" {
-static int gtk_window_expose_callback( GtkWidget *widget, GdkEventExpose *gdk_event, wxWindow *win )
+static gboolean
+gtk_window_expose_callback( GtkWidget *widget,
+ GdkEventExpose *gdk_event,
+ wxWindow *win )
{
GtkPizza *pizza = GTK_PIZZA(widget);
gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
- gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
- GTK_SIGNAL_FUNC(gtk_frame_delete_callback), (gpointer)this );
+ g_signal_connect (m_widget, "delete_event",
+ G_CALLBACK (gtk_frame_delete_callback), this);
// m_mainWidget holds the toolbar, the menubar and the client area
m_mainWidget = gtk_pizza_new();
if (m_miniEdge == 0) // wxMiniFrame has its own version.
{
// For m_mainWidget themes
- gtk_signal_connect( GTK_OBJECT(m_mainWidget), "expose_event",
- GTK_SIGNAL_FUNC(gtk_window_expose_callback), (gpointer)this );
+ g_signal_connect (m_mainWidget, "expose_event",
+ G_CALLBACK (gtk_window_expose_callback), this);
}
// m_wxwindow only represents the client area without toolbar and menubar
if (m_parent) m_parent->AddChild( this );
// the user resized the frame by dragging etc.
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_frame_size_callback), (gpointer)this );
+ g_signal_connect (m_widget, "size_allocate",
+ G_CALLBACK (gtk_frame_size_callback), this);
PostCreation();
// we cannot set MWM hints and icons before the widget has
// been realized, so we do this directly after realization
- gtk_signal_connect( GTK_OBJECT(m_widget), "realize",
- GTK_SIGNAL_FUNC(gtk_frame_realized_callback), (gpointer) this );
+ g_signal_connect (m_widget, "realize",
+ G_CALLBACK (gtk_frame_realized_callback), this);
// map and unmap for iconized state
- gtk_signal_connect( GTK_OBJECT(m_widget), "map_event",
- GTK_SIGNAL_FUNC(gtk_frame_map_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(m_widget), "unmap_event",
- GTK_SIGNAL_FUNC(gtk_frame_unmap_callback), (gpointer)this );
+ g_signal_connect (m_widget, "map_event",
+ G_CALLBACK (gtk_frame_map_callback), this);
+ g_signal_connect (m_widget, "unmap_event",
+ G_CALLBACK (gtk_frame_unmap_callback), this);
// the only way to get the window size is to connect to this event
- gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
- GTK_SIGNAL_FUNC(gtk_frame_configure_callback), (gpointer)this );
+ g_signal_connect (m_widget, "configure_event",
+ G_CALLBACK (gtk_frame_configure_callback), this);
// disable native tab traversal
- gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
- GTK_SIGNAL_FUNC(gtk_frame_focus_callback), (gpointer)this );
+ g_signal_connect (m_widget, "focus",
+ G_CALLBACK (gtk_frame_focus_callback), this);
// activation
- gtk_signal_connect( GTK_OBJECT(m_widget), "focus_in_event",
- GTK_SIGNAL_FUNC(gtk_frame_focus_in_callback), (gpointer)this );
- gtk_signal_connect( GTK_OBJECT(m_widget), "focus_out_event",
- GTK_SIGNAL_FUNC(gtk_frame_focus_out_callback), (gpointer)this );
+ g_signal_connect_after (m_widget, "focus_in_event",
+ G_CALLBACK (gtk_frame_focus_in_callback), this);
+ g_signal_connect_after (m_widget, "focus_out_event",
+ G_CALLBACK (gtk_frame_focus_out_callback), this);
// decorations
if ((m_miniEdge > 0) || (style & wxSIMPLE_BORDER) || (style & wxNO_BORDER))
{
if (m_grabbed)
{
- wxASSERT_MSG( false, _T("Window still grabbed"));
+ wxFAIL_MSG(_T("Window still grabbed"));
RemoveGrab();
}
::wxYieldIfNeeded();
if(m_urgency_hint >= 0)
- gtk_timeout_remove(m_urgency_hint);
+ g_source_remove(m_urgency_hint);
m_urgency_hint = -2;
if (flags & wxUSER_ATTENTION_INFO)
{
- m_urgency_hint = gtk_timeout_add(5000, (GtkFunction)gtk_frame_urgency_timer_callback, this);
+ m_urgency_hint = g_timeout_add(5000, (GSourceFunc)gtk_frame_urgency_timer_callback, this);
} else {
m_urgency_hint = -1;
}
}
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2,7,0)
+#if 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
void wxTopLevelWindowGTK::SetWindowStyleFlag( long style )
{
+#if defined(__WXGTK24__) || GTK_CHECK_VERSION(2,2,0)
// Store which styles were changed
long styleChanges = style ^ m_windowStyle;
+#endif
// Process wxWindow styles. This also updates the internal variable
// Therefore m_windowStyle bits carry now the _new_ style values
projects / wxWidgets.git / blobdiff