#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"
+*/
//-----------------------------------------------------------------------------
// idle system
extern wxList wxPendingDelete;
+/*
+//-----------------------------------------------------------------------------
+// instruct X to set the WM hint for positioning
+//-----------------------------------------------------------------------------
+
+extern "C" {
+
+static void gdk_window_set_position_hint( GdkWindow *window, gint x, gint y )
+{
+ GdkWindowPrivate *priv;
+ XSizeHints size_hints;
+
+ g_return_if_fail (window != NULL);
+
+ priv = (GdkWindowPrivate*) window;
+ if (priv->destroyed) return;
+
+ size_hints.flags = PPosition;
+ size_hints.x = x;
+ size_hints.y = y;
+
+ XSetWMNormalHints (priv->xdisplay, priv->xwindow, &size_hints);
+}
+
+}
+*/
+
//-----------------------------------------------------------------------------
// "delete_event"
//-----------------------------------------------------------------------------
// "configure_event"
//-----------------------------------------------------------------------------
-static gint gtk_dialog_configure_callback( GtkWidget *WXUNUSED(widget), GdkEventConfigure *event, wxDialog *win )
+static gint
+#if (GTK_MINOR_VERSON > 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)
wxapp_install_idle_handler();
if (!win->m_hasVMT) return FALSE;
+#if (GTK_MINOR_VERSON > 0)
+ 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;
+#else
win->m_x = event->x;
win->m_y = event->y;
+#endif
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 );
+
+/*
+ gdk_window_set_position_hint( widget->window, win->m_x, win->m_y );
+*/
/* reset the icon */
if (win->m_icon != wxNullIcon)
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
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
//-----------------------------------------------------------------------------
m_needParent = FALSE;
- PreCreation( parent, id, pos, size, style, name );
+ if (!PreCreation( parent, pos, size ) ||
+ !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+ {
+ wxFAIL_MSG( T("wxDialog creation failed") );
+ return FALSE;
+ }
+ m_insertCallback = (wxInsertChildFunction) wxInsertChildInDialog;
+
m_widget = gtk_window_new( GTK_WINDOW_TOPLEVEL );
if (!name.IsEmpty())
wxDialog::~wxDialog()
{
+ m_isBeingDeleted = TRUE;
+
wxTopLevelWindows.DeleteObject( this );
if (wxTheApp->GetTopWindow() == this)
void wxDialog::SetTitle( const wxString& title )
{
m_title = title;
- if (m_title.IsNull()) m_title = _T("");
+ if (m_title.IsNull()) m_title = T("");
gtk_window_set_title( GTK_WINDOW(m_widget), m_title.mbc_str() );
}
else
{
SetReturnCode(wxID_CANCEL);
- this->Show(FALSE);
+ Show(FALSE);
}
}
void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
{
- if ( Validate() && TransferDataFromWindow())
+ if (Validate() && TransferDataFromWindow())
{
if (IsModal())
{
void wxDialog::OnSize( wxSizeEvent &WXUNUSED(event) )
{
- wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
+ 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;
void wxDialog::DoSetSize( int x, int y, int width, int height, int sizeFlags )
{
- wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
- wxASSERT_MSG( (m_wxwindow != NULL), _T("invalid dialog") );
+ wxASSERT_MSG( (m_widget != NULL), T("invalid dialog") );
+ wxASSERT_MSG( (m_wxwindow != NULL), T("invalid dialog") );
if (m_resizing) return; /* I don't like recursions */
m_resizing = TRUE;
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;
void wxDialog::Centre( int direction )
{
- wxASSERT_MSG( (m_widget != NULL), _T("invalid dialog") );
+ wxASSERT_MSG( (m_widget != NULL), T("invalid dialog") );
int x = 0;
int y = 0;
{
if (!m_sizeSet && GTK_WIDGET_REALIZED(m_wxwindow))
GtkOnSize( m_x, m_y, m_width, m_height );
+
+ wxWindow::OnInternalIdle();
}
bool wxDialog::Show( bool show )
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
else
if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
*/
- wxFAIL_MSG( _T("wxDialog:SetModal obsolete now") );
+ wxFAIL_MSG( T("wxDialog:SetModal obsolete now") );
}
int wxDialog::ShowModal()
{
if (IsModal())
{
- wxFAIL_MSG( _T("wxDialog:ShowModal called twice") );
+ wxFAIL_MSG( T("wxDialog:ShowModal called twice") );
return GetReturnCode();
}
+ wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
+
Show( TRUE );
m_modalShowing = TRUE;
if (!IsModal())
{
- wxFAIL_MSG( _T("wxDialog:EndModal called twice") );
+ wxFAIL_MSG( T("wxDialog:EndModal called twice") );
return;
}
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