projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing file paths after renaming
[wxWidgets.git]
/
src
/
gtk1
/
dialog.cpp
diff --git
a/src/gtk1/dialog.cpp
b/src/gtk1/dialog.cpp
index 68a991a37175a6f41c79feb1dc5e053114eb683f..540910d9dc035f9b00b5cb016fad385a4464b07b 100644
(file)
--- a/
src/gtk1/dialog.cpp
+++ b/
src/gtk1/dialog.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: dialog.cpp
+// Name:
src/gtk1/
dialog.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Purpose:
// Author: Robert Roebling
// Id: $Id$
@@
-7,31
+7,31
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dialog.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/dialog.h"
#include "wx/dialog.h"
-#include "wx/frame.h"
-#include "wx/app.h"
-#include "wx/cursor.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/frame.h"
+ #include "wx/cursor.h"
+#endif // WX_PRECOMP
+
+#include "wx/evtloop.h"
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include "wx/gtk/win_gtk.h"
+#include "wx/gtk
1
/win_gtk.h"
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-//
idle system
+//
global data
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
extern int g_openDialogs;
extern int g_openDialogs;
-
-
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// wxDialog
//-----------------------------------------------------------------------------
@@
-48,9
+48,9
@@
IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
void wxDialog::Init()
{
m_returnCode = 0;
void wxDialog::Init()
{
m_returnCode = 0;
- m_sizeSet =
FALSE
;
- m_modalShowing =
FALSE
;
- m_themeEnabled =
TRUE
;
+ m_sizeSet =
false
;
+ m_modalShowing =
false
;
+ m_themeEnabled =
true
;
}
wxDialog::wxDialog( wxWindow *parent,
}
wxDialog::wxDialog( wxWindow *parent,
@@
-91,7
+91,7
@@
void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
else
{
SetReturnCode(wxID_CANCEL);
else
{
SetReturnCode(wxID_CANCEL);
- Show(
FALSE
);
+ Show(
false
);
}
}
}
}
@@
-106,7
+106,7
@@
void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
else
{
SetReturnCode(wxID_OK);
else
{
SetReturnCode(wxID_OK);
- Show(
FALSE
);
+ Show(
false
);
}
}
}
}
}
}
@@
-141,7
+141,7
@@
void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
cancelEvent.SetEventObject( this );
-
GetEventHandler()->Process
Event(cancelEvent);
+
HandleWindow
Event(cancelEvent);
s_closing.DeleteObject(this);
}
s_closing.DeleteObject(this);
}
@@
-162,6
+162,9
@@
bool wxDialog::Show( bool show )
GtkOnSize( m_x, m_y, m_width, m_height );
}
GtkOnSize( m_x, m_y, m_width, m_height );
}
+ if (show && CanDoLayoutAdaptation())
+ DoLayoutAdaptation();
+
bool ret = wxWindow::Show( show );
if (show) InitDialog();
bool ret = wxWindow::Show( show );
if (show) InitDialog();
@@
-176,12
+179,6
@@
bool wxDialog::IsModal() const
void wxDialog::SetModal( bool WXUNUSED(flag) )
{
void wxDialog::SetModal( bool WXUNUSED(flag) )
{
-/*
- if (flag)
- m_windowStyle |= wxDIALOG_MODAL;
- else
- if (m_windowStyle & wxDIALOG_MODAL) m_windowStyle -= wxDIALOG_MODAL;
-*/
wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
}
wxFAIL_MSG( wxT("wxDialog:SetModal obsolete now") );
}
@@
-197,11
+194,8
@@
int wxDialog::ShowModal()
// forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{
// forbidden
if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
{
- wxWindow *parent = wxTheApp->GetTopWindow();
- if ( parent &&
- parent != this &&
- parent->IsBeingDeleted() &&
- !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )
+ wxWindow * const parent = GetParentForModalDialog();
+ if ( parent )
{
m_parent = parent;
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
{
m_parent = parent;
gtk_window_set_transient_for( GTK_WINDOW(m_widget), GTK_WINDOW(parent->m_widget) );
@@
-210,14
+204,16
@@
int wxDialog::ShowModal()
wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
- Show(
TRUE
);
+ Show(
true
);
- m_modalShowing =
TRUE
;
+ m_modalShowing =
true
;
g_openDialogs++;
gtk_grab_add( m_widget );
g_openDialogs++;
gtk_grab_add( m_widget );
- gtk_main();
+
+ wxEventLoop().Run();
+
gtk_grab_remove( m_widget );
g_openDialogs--;
gtk_grab_remove( m_widget );
g_openDialogs--;
@@
-235,9
+231,9
@@
void wxDialog::EndModal( int retCode )
return;
}
return;
}
- m_modalShowing =
FALSE
;
+ m_modalShowing =
false
;
gtk_main_quit();
gtk_main_quit();
- Show(
FALSE
);
+ Show(
false
);
}
}