Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 5bfa14b7f6bfbe7d78078d0296391c524760ed36..dddd390ab56bf8192c08b921a46e1e4d46057867 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -48,7 +48,7 @@
 #include "wx/ptr_scpd.h"
 
 #if defined(__WXMSW__)
-  #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
+    #include  "wx/msw/private.h"  // includes windows.h for LOGFONT
 #endif
 
 #if wxUSE_FONTMAP
@@ -78,8 +78,8 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
 wxAppBase::wxAppBase()
 {
     m_topWindow = (wxWindow *)NULL;
-    m_useBestVisual = FALSE;
-    m_isActive = TRUE;
+    m_useBestVisual = false;
+    m_isActive = true;
 
 #if wxUSE_EVTLOOP_IN_APP
     m_mainLoop = NULL;
@@ -91,10 +91,10 @@ wxAppBase::wxAppBase()
     // OTOH, if we set it to No initially we'll have to overwrite it with Yes
     // when we enter our OnRun() because we do want the default behaviour from
     // then on. But this would be a problem if the user code calls
-    // SetExitOnFrameDelete(FALSE) from OnInit().
+    // SetExitOnFrameDelete(false) from OnInit().
     //
     // So we use the special "Later" value which is such that
-    // GetExitOnFrameDelete() returns FALSE for it but which we know we can
+    // GetExitOnFrameDelete() returns false for it but which we know we can
     // safely (i.e. without losing the effect of the users SetExitOnFrameDelete
     // call) overwrite in OnRun()
     m_exitOnFrameDelete = Later;
@@ -128,9 +128,19 @@ wxAppBase::~wxAppBase()
 
 void wxAppBase::CleanUp()
 {
-    // one last chance for pending objects to be cleaned up
+    // clean up all the pending objects
     DeletePendingObjects();
 
+    // and any remaining TLWs (they remove themselves from wxTopLevelWindows
+    // when destroyed, so iterate until none are left)
+    while ( !wxTopLevelWindows.empty() )
+    {
+        // do not use Destroy() here as it only puts the TLW in pending list
+        // but we want to delete them now
+        delete wxTopLevelWindows.GetFirst()->GetData();
+    }
+
+    // undo everything we did in Initialize() above
     wxBitmap::CleanUpHandlers();
 
     wxDeleteStockObjects();
@@ -174,7 +184,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,
-            _T(""),
+            wxEmptyString,
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,
@@ -188,7 +198,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,
-            _T(""),
+            wxEmptyString,
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,
@@ -199,9 +209,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         // terminator
         {
             wxCMD_LINE_NONE,
-            _T(""),
-            _T(""),
-            _T(""),
+            wxEmptyString,
+            wxEmptyString,
+            wxEmptyString,
             wxCMD_LINE_VAL_NONE,
             0x0
         }
@@ -220,7 +230,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( !theme )
         {
             wxLogError(_("Unsupported theme '%s'."), themeName.c_str());
-            return FALSE;
+            return false;
         }
 
         // Delete the defaultly created theme and set the new theme.
@@ -237,11 +247,11 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
         if ( wxSscanf(modeDesc.c_str(), _T("%ux%u-%u"), &w, &h, &bpp) != 3 )
         {
             wxLogError(_("Invalid display mode specification '%s'."), modeDesc.c_str());
-            return FALSE;
+            return false;
         }
 
-        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )
-            return FALSE;
+        if ( !SetDisplayMode(wxVideoMode(w, h, bpp)) )
+            return false;
     }
 #endif // __WXMGL__
 
@@ -311,10 +321,10 @@ bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__
     if ( !wxTheme::Get() && !wxTheme::CreateDefault() )
-        return FALSE;
+        return false;
 #endif // __WXUNIVERSAL__
 
-    return TRUE;
+    return true;
 }
 
 int wxAppBase::OnRun()
@@ -384,34 +394,34 @@ void wxAppBase::DeletePendingObjects()
     }
 }
 
-// Returns TRUE if more time is needed.
+// Returns true if more time is needed.
 bool wxAppBase::ProcessIdle()
 {
     wxIdleEvent event;
-    bool needMore = FALSE;
+    bool needMore = false;
     wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
     while (node)
     {
         wxWindow* win = node->GetData();
         if (SendIdleEvents(win, event))
-            needMore = TRUE;
+            needMore = true;
         node = node->GetNext();
     }
 
     event.SetEventObject(this);
     (void) ProcessEvent(event);
     if (event.MoreRequested())
-        needMore = TRUE;
+        needMore = true;
 
     wxUpdateUIEvent::ResetUpdateTime();
-    
+
     return needMore;
 }
 
 // Send idle event to window and all subwindows
 bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 {
-    bool needMore = FALSE;
+    bool needMore = false;
 
     win->OnInternalIdle();
 
@@ -421,14 +431,14 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
         win->GetEventHandler()->ProcessEvent(event);
 
         if (event.MoreRequested())
-            needMore = TRUE;
+            needMore = true;
     }
     wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
     while ( node )
     {
         wxWindow *child = node->GetData();
         if (SendIdleEvents(child, event))
-            needMore = TRUE;
+            needMore = true;
 
         node = node->GetNext();
     }
@@ -465,7 +475,12 @@ void wxAppBase::OnIdle(wxIdleEvent& WXUNUSED(event))
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
+#if wxUSE_LOGGUI
     return new wxLogGui;
+#else
+    // we must have something!
+    return new wxLogStderr;
+#endif
 }
 
 #endif // wxUSE_LOG
@@ -521,7 +536,7 @@ bool wxGUIAppTraitsBase::ShowAssertDialog(const wxString& msg)
               wxT("You can also choose [Cancel] to suppress ")
               wxT("further warnings.");
 
-    switch ( wxMessageBox(msgDlg, wxT("wxWindows Debug Alert"),
+    switch ( wxMessageBox(msgDlg, wxT("wxWidgets Debug Alert"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) )
     {
         case wxYES:
@@ -565,10 +580,10 @@ void wxGUIAppTraitsBase::RemoveFromPendingDelete(wxObject *object)
 
 #if wxUSE_SOCKETS
 
-#if defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
-    #include "wx/unix/gsockunx.h"
-#elif defined(__WINDOWS__)
+#if defined(__WINDOWS__)
     #include "wx/msw/gsockmsw.h"
+#elif defined(__UNIX__) || defined(__DARWIN__) || defined(__OS2__)
+    #include "wx/unix/gsockunx.h"
 #elif defined(__WXMAC__)
   #include <MacHeaders.c>
   #define OTUNIXERRORS 1
@@ -588,31 +603,10 @@ GSocketGUIFunctionsTable* wxGUIAppTraitsBase::GetSocketGUIFunctionsTable()
     //     so it doesn't need this table at all
     return NULL;
 #else // !__WXMAC__ || __DARWIN__
-    static GSocketGUIFunctionsTable table =
-    {
-        _GSocket_GUI_Init,
-        _GSocket_GUI_Cleanup,
-        _GSocket_GUI_Init_Socket,
-        _GSocket_GUI_Destroy_Socket,
-#ifndef __WINDOWS__
-        _GSocket_Install_Callback,
-        _GSocket_Uninstall_Callback,
-#endif
-        _GSocket_Enable_Events,
-        _GSocket_Disable_Events
-    };
+    static GSocketGUIFunctionsTableConcrete table;
     return &table;
 #endif // !__WXMAC__ || __DARWIN__
 }
 
-GSocketBSD* wxGUIAppTraitsBase::CreateGSocket()
-{
-#ifdef wxUSE_GSOCKET_CPLUSPLUS
-    return new GSocketBSDGUIShim();
-#else
-    return NULL;
-#endif
-}
-
 #endif