#include "wx/dialog.h"
#include "wx/frame.h"
#include "wx/app.h"
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "wx/gtk/win_gtk.h"
#include "wx/cursor.h"
-/*
-#include "gdk/gdkprivate.h"
-#include "gdk/gdkx.h"
-*/
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "wx/gtk/win_gtk.h"
//-----------------------------------------------------------------------------
// idle system
extern void wxapp_install_idle_handler();
extern bool g_isIdle;
+extern int g_openDialogs;
//-----------------------------------------------------------------------------
// data
extern wxList wxPendingDelete;
+//-----------------------------------------------------------------------------
+// "focus" from m_window
+//-----------------------------------------------------------------------------
+
+static gint gtk_dialog_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" );
+ return TRUE;
+}
+
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
win->Close();
static void gtk_dialog_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return;
{
win->m_width = alloc->width;
win->m_height = alloc->height;
- win->UpdateSize();
+ win->GtkUpdateSize();
}
}
// "configure_event"
//-----------------------------------------------------------------------------
-static gint
-#if (GTK_MINOR_VERSON > 0)
+static gint
+#if (GTK_MINOR_VERSION > 0)
gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
#else
gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
#endif
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE;
-#if (GTK_MINOR_VERSON > 0)
+#if (GTK_MINOR_VERSION > 0)
int x = 0;
int y = 0;
gdk_window_get_root_origin( win->m_widget->window, &x, &y );
// "realize" from m_widget
//-----------------------------------------------------------------------------
-/* we cannot MWM hints and icons before the widget has been realized,
+/* we cannot MWM hints and icons before the widget has been realized,
so we do this directly after realization */
-static gint
+static gint
gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
{
- if (g_isIdle)
+ if (g_isIdle)
wxapp_install_idle_handler();
/* I haven't been able to set the position of
the dialog before it is shown, so I set the
position in "realize" */
- gtk_window_reposition( GTK_WINDOW(widget), win->m_x, win->m_y );
+ gtk_widget_set_uposition( widget, win->m_x, win->m_y );
/* all this is for Motif Window Manager "hints" and is supposed to be
recognized by other WM as well. not tested. */
This avoids the problem, but looks odd. What shall we do?
*/
decor |= GDK_DECOR_RESIZEH;
-
+
if ((win->GetWindowStyle() & wxCAPTION) != 0)
decor |= GDK_DECOR_TITLE;
if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
{
decor |= GDK_DECOR_MAXIMIZE;
- func |= GDK_FUNC_MAXIMIZE;
+ func |= GDK_FUNC_MAXIMIZE;
}
if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
{
}
gdk_window_set_decorations( win->m_widget->window, (GdkWMDecoration)decor);
gdk_window_set_functions( win->m_widget->window, (GdkWMFunction)func);
-
+
/* GTK's shrinking/growing policy */
if ((win->GetWindowStyle() & wxRESIZE_BORDER) == 0)
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 0, 0, 1);
else
gtk_window_set_policy(GTK_WINDOW(win->m_widget), 1, 1, 1);
-
+
/* set size hints */
- gint flag = GDK_HINT_POS;
+ gint flag = 0; // GDK_HINT_POS;
if ((win->GetMinWidth() != -1) || (win->GetMinHeight() != -1)) flag |= GDK_HINT_MIN_SIZE;
if ((win->GetMaxWidth() != -1) || (win->GetMaxHeight() != -1)) flag |= GDK_HINT_MAX_SIZE;
if (flag)
{
- gdk_window_set_hints( win->m_widget->window,
- win->m_x, win->m_y,
- win->GetMinWidth(), win->GetMinHeight(),
- win->GetMaxWidth(), win->GetMaxHeight(),
- flag );
+ gdk_window_set_hints( win->m_widget->window,
+ win->m_x, win->m_y,
+ win->GetMinWidth(), win->GetMinHeight(),
+ win->GetMaxWidth(), win->GetMaxHeight(),
+ flag );
}
/* reset the icon */
win->m_icon = wxNullIcon;
win->SetIcon( icon );
}
-
+
return FALSE;
}
-
+
//-----------------------------------------------------------------------------
// InsertChild for wxDialog
//-----------------------------------------------------------------------------
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
+ g_openDialogs++;
+
wxTopLevelWindows.Append( this );
m_needParent = FALSE;
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
{
wxFAIL_MSG( wxT("wxDialog creation failed") );
- return FALSE;
+ return FALSE;
}
+ // All dialogs should really have this style
+ m_windowStyle |= wxTAB_TRAVERSAL;
+
m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
-
+
m_widget = gtk_window_new( GTK_WINDOW_DIALOG );
-
+
if ((m_parent) && (GTK_IS_WINDOW(m_parent->m_widget)))
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(m_parent->m_widget) );
-
+
if (!name.IsEmpty())
gtk_window_set_wmclass( GTK_WINDOW(m_widget), name.mb_str(), name.mb_str() );
-
+
GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS );
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
gtk_signal_connect( GTK_OBJECT(m_widget), "configure_event",
GTK_SIGNAL_FUNC(gtk_dialog_configure_callback), (gpointer)this );
+ /* disable native tab traversal */
+ gtk_signal_connect( GTK_OBJECT(m_widget), "focus",
+ GTK_SIGNAL_FUNC(gtk_dialog_focus_callback), (gpointer)this );
+
return TRUE;
}
wxDialog::~wxDialog()
{
m_isBeingDeleted = TRUE;
-
+
wxTopLevelWindows.DeleteObject( this );
if (wxTheApp->GetTopWindow() == this)
wxTheApp->SetTopWindow( (wxWindow*) NULL );
}
- if (wxTopLevelWindows.Number() == 0)
+ if ((wxTopLevelWindows.Number() == 0) &&
+ (wxTheApp->GetExitOnFrameDelete()))
{
wxTheApp->ExitMainLoop();
}
+
+ g_openDialogs--;
}
void wxDialog::SetTitle( const wxString& title )
}
}
+void wxDialog::DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), int WXUNUSED(width), int WXUNUSED(height) )
+{
+ wxFAIL_MSG( wxT("DoMoveWindow called for wxDialog") );
+}
+
void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
wxASSERT_MSG( (m_widget != NULL), wxT("invalid dialog") );
int old_x = m_x;
int old_y = m_y;
+
int old_width = m_width;
int old_height = m_height;
{
/* we set the position here and when showing the dialog
for the first time in idle time */
- gtk_window_reposition( GTK_WINDOW(m_widget), m_x, m_y );
+ gtk_widget_set_uposition( m_widget, m_x, m_y );
}
}
}
wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
-
+
Show( TRUE );
m_modalShowing = TRUE;
projects / wxWidgets.git / blobdiff