Wrappers for *ToText

[wxWidgets.git] / src / gtk / dialog.cpp

diff --git a/src/gtk/dialog.cpp b/src/gtk/dialog.cpp
index 1b206e4a2d028cd5f5a782394095c6b68a90f21b..9f8a2f64500241d956aa16be2273a42e73d4e465 100644 (file)
--- a/src/gtk/dialog.cpp
+++ b/src/gtk/dialog.cpp
@@ -7,10 +7,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "dialog.h"
 #endif
 
 #pragma implementation "dialog.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/dialog.h"
 #include "wx/frame.h"
 #include "wx/app.h"


@@ -30,8 +33,6 @@ extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern int g_openDialogs;
 
 extern bool g_isIdle;
 extern int g_openDialogs;
 

-
-

 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxDialog
 //-----------------------------------------------------------------------------


@@ -59,11 +60,8 @@ wxDialog::wxDialog( wxWindow *parent,
                     long style, const wxString &name )
 {
     Init();
                     long style, const wxString &name )
 {
     Init();

-    
-    // all dialogs should have tab traversal enabled
-    style |= wxTAB_TRAVERSAL;

 
 

-    Create( parent, id, title, pos, size, style, name );
+    (void)Create( parent, id, title, pos, size, style, name );

 }
 
 bool wxDialog::Create( wxWindow *parent,
 }
 
 bool wxDialog::Create( wxWindow *parent,


@@ -71,14 +69,18 @@ bool wxDialog::Create( wxWindow *parent,
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {
                        const wxPoint &pos, const wxSize &size,
                        long style, const wxString &name )
 {

-    SetExtraStyle(GetExtraStyle() | wxTLW_EX_DIALOG);
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);
+
+    // all dialogs should have tab traversal enabled
+    style |= wxTAB_TRAVERSAL;

 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {
 
     return wxTopLevelWindow::Create(parent, id, title, pos, size, style, name);
 }
 
 void wxDialog::OnApply( wxCommandEvent &WXUNUSED(event) )
 {

-    if (Validate()) TransferDataFromWindow();
+    if (Validate())
+        TransferDataFromWindow();

 }
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
 }
 
 void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )


@@ -175,12 +177,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,7 +193,10 @@ int wxDialog::ShowModal()
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();
     if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
     {
         wxWindow *parent = wxTheApp->GetTopWindow();

-        if ( parent && parent != this )
+        if ( parent &&
+                parent != this &&
+                    parent->IsBeingDeleted() &&
+                        !(parent->GetExtraStyle() & wxWS_EX_TRANSIENT) )

         {
             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) );


@@ -205,9 +204,11 @@ int wxDialog::ShowModal()
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor

-
+    

     Show( TRUE );
 
     Show( TRUE );
 

+    SetFocus();
+

     m_modalShowing = TRUE;
 
     g_openDialogs++;
     m_modalShowing = TRUE;
 
     g_openDialogs++;