Disable symbols visibility support for the Clang compiler.

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

diff --git a/src/gtk1/dialog.cpp b/src/gtk1/dialog.cpp
index 884704449599044b50daa37c59a67142e5100635..1646b771cbde9e447009f9106e0277dae0739e08 100644 (file)
--- a/src/gtk1/dialog.cpp
+++ b/src/gtk1/dialog.cpp
@@ -1,36 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dialog.cpp
+// Name:        src/gtk1/dialog.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dialog.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #include "wx/dialog.h"
 // 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/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/gtk1/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;
 
 //-----------------------------------------------------------------------------


@@ -44,14 +43,12 @@ BEGIN_EVENT_TABLE(wxDialog,wxDialogBase)
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 
     EVT_CLOSE   (wxDialog::OnCloseWindow)
 END_EVENT_TABLE()
 

-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,


@@ -92,7 +89,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
     else
     {
         SetReturnCode(wxID_CANCEL);
     else
     {
         SetReturnCode(wxID_CANCEL);

-        Show(FALSE);
+        Show(false);

     }
 }
 
     }
 }
 


@@ -107,7 +104,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
         else
         {
             SetReturnCode(wxID_OK);
         else
         {
             SetReturnCode(wxID_OK);

-            Show(FALSE);
+            Show(false);

         }
     }
 }
         }
     }
 }


@@ -142,7 +139,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()->ProcessEvent(cancelEvent);
+    HandleWindowEvent(cancelEvent);

     s_closing.DeleteObject(this);
 }
 
     s_closing.DeleteObject(this);
 }
 


@@ -163,6 +160,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();


@@ -177,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") );
 }
 


@@ -196,31 +190,25 @@ int wxDialog::ShowModal()
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden
 
     // use the apps top level window as parent if none given unless explicitly
     // forbidden

-    if ( !GetParent() && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) )
+    wxWindow * const parent = GetParentForModalDialog();
+    if ( parent )

     {
     {

-        wxWindow *parent = wxTheApp->GetTopWindow();
-        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) );

     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
     }
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor

-    
-    Show( TRUE );

 
 

-    SetFocus();
+    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--;


@@ -238,9 +226,9 @@ void wxDialog::EndModal( int retCode )
         return;
     }
 
         return;
     }
 

-    m_modalShowing = FALSE;
+    m_modalShowing = false;

 
     gtk_main_quit();
 
 
     gtk_main_quit();
 

-    Show( FALSE );
+    Show( false );

 }
 }