bool gtk_dialog_delete_callback( GtkWidget *WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxDialog *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
-
-/*
- printf( "OnDelete from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
+ 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) wxapp_install_idle_handler();
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- if (!win->HasVMT()) return;
-
-/*
- printf( "OnDialogResize from " );
- if (win->GetClassInfo() && win->GetClassInfo()->GetClassName())
- printf( win->GetClassInfo()->GetClassName() );
- printf( ".\n" );
-*/
+ if (!win->m_hasVMT) return;
- if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
- {
- win->m_sizeSet = FALSE;
- win->m_width = alloc->width;
- win->m_height = alloc->height;
- }
+ if ((win->m_width != alloc->width) || (win->m_height != alloc->height))
+ {
+ win->m_width = alloc->width;
+ win->m_height = alloc->height;
+ win->UpdateSize();
+ }
}
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
-static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *WXUNUSED(event), wxDialog *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ if (g_isIdle)
+ wxapp_install_idle_handler();
- if (!win->HasVMT()) return FALSE;
+ if (!win->m_hasVMT) return FALSE;
- win->m_x = event->x;
- win->m_y = event->y;
+ int x = 0;
+ int y = 0;
+ gdk_window_get_root_origin( win->m_widget->window, &x, &y );
+
+ win->m_x = x;
+ win->m_y = y;
wxMoveEvent mevent( wxPoint(win->m_x,win->m_y), win->GetId() );
mevent.SetEventObject( win );
static gint
gtk_dialog_realized_callback( GtkWidget *widget, wxDialog *win )
{
- if (g_isIdle) wxapp_install_idle_handler();
+ 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" and "map" */
+ gtk_widget_set_uposition( widget, win->m_x, win->m_y );
/* reset the icon */
if (win->m_icon != wxNullIcon)
{
wxIcon icon( win->m_icon );
win->m_icon = wxNullIcon;
- win->SetIcon( icon );
+ win->SetIcon( icon );
}
return FALSE;
static gint
gtk_dialog_map_callback( GtkWidget *widget, wxDialog *win )
{
+ 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 do it here */
+ the dialog before it is shown, so I set the
+ position in "realize" and "map" */
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. */
- long decor = (long) GDK_DECOR_ALL;
- long func = (long) GDK_FUNC_ALL;
+ long decor = (long) GDK_DECOR_BORDER;
+ long func = (long) GDK_FUNC_MOVE ;
- if ((win->m_windowStyle & wxCAPTION) == 0)
- decor |= GDK_DECOR_TITLE;
- if ((win->m_windowStyle & wxSYSTEM_MENU) == 0)
- decor |= GDK_DECOR_MENU;
- if ((win->m_windowStyle & wxMINIMIZE_BOX) == 0)
+ if ((win->GetWindowStyle() & wxCAPTION) != 0)
+ decor |= GDK_DECOR_TITLE;
+ if ((win->GetWindowStyle() & wxSYSTEM_MENU) != 0)
{
- func |= GDK_FUNC_MINIMIZE;
- decor |= GDK_DECOR_MINIMIZE;
+ decor |= GDK_DECOR_MENU;
+ func |= GDK_FUNC_CLOSE;
}
- if ((win->m_windowStyle & wxMAXIMIZE_BOX) == 0)
+ if ((win->GetWindowStyle() & wxMINIMIZE_BOX) != 0)
{
- decor |= GDK_DECOR_MAXIMIZE;
- func |= GDK_FUNC_MAXIMIZE;
+ func |= GDK_FUNC_MINIMIZE;
+ decor |= GDK_DECOR_MINIMIZE;
+ }
+ if ((win->GetWindowStyle() & wxMAXIMIZE_BOX) != 0)
+ {
+ decor |= GDK_DECOR_MAXIMIZE;
+ func |= GDK_FUNC_MAXIMIZE;
+ }
+ if ((win->GetWindowStyle() & wxRESIZE_BORDER) != 0)
+ {
+ func |= GDK_FUNC_RESIZE;
+ decor |= GDK_DECOR_RESIZEH;
}
- if ((win->m_windowStyle & wxRESIZE_BORDER) == 0)
- func |= GDK_FUNC_RESIZE;
-
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->m_windowStyle & wxRESIZE_BORDER) == 0)
+ 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);
return FALSE;
}
+//-----------------------------------------------------------------------------
+// InsertChild for wxDialog
+//-----------------------------------------------------------------------------
+
+/* Callback for wxFrame. This very strange beast has to be used because
+ * C++ has no virtual methods in a constructor. We have to emulate a
+ * virtual function here as wxWindows requires different ways to insert
+ * a child in container classes. */
+
+static void wxInsertChildInDialog( wxDialog* parent, wxWindow* child )
+{
+ gtk_myfixed_put( GTK_MYFIXED(parent->m_wxwindow),
+ GTK_WIDGET(child->m_widget),
+ child->m_x,
+ child->m_y,
+ child->m_width,
+ child->m_height );
+
+ if (parent->HasFlag(wxTAB_TRAVERSAL))
+ {
+ /* we now allow a window to get the focus as long as it
+ doesn't have any children. */
+ GTK_WIDGET_UNSET_FLAGS( parent->m_wxwindow, GTK_CAN_FOCUS );
+ }
+}
+
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
void wxDialog::Init()
{
+ m_returnCode = 0;
m_sizeSet = FALSE;
m_modalShowing = FALSE;
}
PreCreation( parent, id, pos, size, style, name );
+ m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+
m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
+
+ 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_widget_set( m_widget, "GtkWindow::allow_shrink", TRUE, NULL);
-
gtk_signal_connect( GTK_OBJECT(m_widget), "delete_event",
GTK_SIGNAL_FUNC(gtk_dialog_delete_callback), (gpointer)this );
/* we cannot set MWM hints 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_dialog_realized_callback), (gpointer) this );
+ GTK_SIGNAL_FUNC(gtk_dialog_realized_callback), (gpointer) this );
/* we set the position of the window after the map event. setting it
before has no effect (with KWM) */
gtk_signal_connect( GTK_OBJECT(m_widget), "map",
- GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this );
+ GTK_SIGNAL_FUNC(gtk_dialog_map_callback), (gpointer) this );
/* the user resized the frame by dragging etc. */
gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
wxDialog::~wxDialog()
{
+ m_isBeingDeleted = TRUE;
+
wxTopLevelWindows.DeleteObject( this );
if (wxTheApp->GetTopWindow() == this)
else
{
SetReturnCode(wxID_CANCEL);
- this->Show(FALSE);
+ Show(FALSE);
}
}
void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
{
- if ( Validate() && TransferDataFromWindow())
+ if (Validate() && TransferDataFromWindow())
{
if (IsModal())
{
{
wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
+#if wxUSE_CONSTRAINTS
if (GetAutoLayout())
{
Layout();
}
else
+#endif // wxUSE_CONSTRAINTS
{
/* no child: go out ! */
if (!GetChildren().First()) return;
int old_width = m_width;
int old_height = m_height;
- if ((sizeFlags & wxSIZE_USE_EXISTING) == wxSIZE_USE_EXISTING)
+ if ((sizeFlags & wxSIZE_ALLOW_MINUS_ONE) == 0)
{
if (x != -1) m_x = x;
if (y != -1) m_y = y;
if ((m_x != -1) || (m_y != -1))
{
if ((m_x != old_x) || (m_y != old_y))
- {
- /* we set the position here and when showing the dialog
- for the first time in idle time */
+ {
+ /* we set the position here and when showing the dialog
+ for the first time in idle time */
gtk_widget_set_uposition( m_widget, m_x, m_y );
- }
+ }
}
if ((m_width != old_width) || (m_height != old_height))
{
/* actual resizing is deferred to GtkOnSize in idle time and
- when showing the dialog */
+ when showing the dialog */
m_sizeSet = FALSE;
}
GtkOnSize( m_x, m_y, m_width, m_height );
}
- if (show != m_isShown)
- {
- if (show)
- {
- gtk_widget_show( m_widget );
- }
- else
- gtk_widget_hide( m_widget );
-
- m_isShown = show;
- }
+ bool ret = wxWindow::Show( show );
if (show) InitDialog();
- return TRUE;
+ return ret;
}
bool wxDialog::IsModal() const
m_icon = icon;
if (!icon.Ok()) return;
+ if (!m_widget->window) return;
+
wxMask *mask = icon.GetMask();
GdkBitmap *bm = (GdkBitmap *) NULL;
if (mask) bm = mask->GetBitmap();
projects / wxWidgets.git / blobdiff