eVC3 warning fix.

[wxWidgets.git] / src / msw / app.cpp

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 7d430057a94f7e5c2384d95b4f3b50a454bd5e89..bc230fe15226ece02563a06ff6454b203423e416 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -99,14 +99,17 @@ extern void wxSetKeyboardHook(bool doIt);
 
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this
 
 // NB: all "NoRedraw" classes must have the same names as the "normal" classes
 //     with NR suffix - wxWindow::MSWCreate() supposes this

-const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
-const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");
-const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
-const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
-const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
-const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
-
-HBRUSH wxDisableButtonBrush = (HBRUSH) 0;
+#ifdef __WXWINCE__
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassName;
+WXDLLIMPEXP_CORE       wxChar *wxCanvasClassNameNR;
+#else
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassName        = wxT("wxWindowClass");
+WXDLLIMPEXP_CORE const wxChar *wxCanvasClassNameNR      = wxT("wxWindowClassNR");
+#endif
+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassName      = wxT("wxMDIFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIFrameClassNameNoRedraw = wxT("wxMDIFrameClassNR");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassName = wxT("wxMDIChildFrameClass");
+WXDLLIMPEXP_CORE const wxChar *wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -180,7 +183,7 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
 {
     wxEndBusyCursor();
 
 {
     wxEndBusyCursor();
 

-    const ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;
+    ChildWaitLoopData * const data = (ChildWaitLoopData *)dataOrig;

 
     delete data->wd;
 
 
     delete data->wd;
 


@@ -188,6 +191,9 @@ void wxGUIAppTraits::AfterChildWaitLoop(void *dataOrig)
     // the other windows reenabled, the activation is going to return to the
     // window which had had it before
     data->winActive->Destroy();
     // the other windows reenabled, the activation is going to return to the
     // window which had had it before
     data->winActive->Destroy();

+
+    // also delete the temporary data object itself
+    delete data;

 }
 
 bool wxGUIAppTraits::DoMessageFromThreadWait()
 }
 
 bool wxGUIAppTraits::DoMessageFromThreadWait()


@@ -254,6 +260,20 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     // ensure that base cleanup is done if we return too early
     wxCallBaseCleanup callBaseCleanup(this);
 
     // ensure that base cleanup is done if we return too early
     wxCallBaseCleanup callBaseCleanup(this);
 

+#ifdef __WXWINCE__
+    wxString tmp = GetAppName();
+    tmp += wxT("ClassName");
+    wxCanvasClassName = wxStrdup( tmp.c_str() );
+    tmp += wxT("NR");
+    wxCanvasClassNameNR = wxStrdup( tmp.c_str() );
+    HWND hWnd = FindWindow( wxCanvasClassNameNR, NULL );
+    if (hWnd)
+    {
+        SetForegroundWindow( (HWND)(((DWORD)hWnd)|0x01) );
+        return false;
+    }
+#endif
+

     // the first thing to do is to check if we're trying to run an Unicode
     // program under Win9x w/o MSLU emulation layer - if so, abort right now
     // as it has no chance to work
     // the first thing to do is to check if we're trying to run an Unicode
     // program under Win9x w/o MSLU emulation layer - if so, abort right now
     // as it has no chance to work


@@ -267,11 +287,11 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
         (
          NULL,
          _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),
         (
          NULL,
          _T("This program uses Unicode and requires Windows NT/2000/XP/CE.\nProgram aborted."),

-         _T("wxWindows Fatal Error"),
+         _T("wxWidgets Fatal Error"),

          MB_ICONERROR | MB_OK
         );
 
          MB_ICONERROR | MB_OK
         );
 

-        return FALSE;
+        return false;

     }
 #endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
 
     }
 #endif // wxUSE_UNICODE && !wxUSE_UNICODE_MSLU
 


@@ -303,21 +323,6 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 

-#if defined(__WXMICROWIN__) && !defined(__WXWINCE__)
-    // Create the brush for disabling bitmap buttons
-
-    LOGBRUSH lb;
-    lb.lbStyle = BS_PATTERN;
-    lb.lbColor = 0;
-    lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );
-    if ( lb.lbHatch )
-    {
-        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
-        ::DeleteObject( (HGDIOBJ)lb.lbHatch );
-    }
-    //else: wxWindows resources are probably not linked in
-#endif
-

 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
 #endif
 #if wxUSE_PENWINDOWS
     wxRegisterPenWin();
 #endif


@@ -325,7 +330,7 @@ bool wxApp::Initialize(int& argc, wxChar **argv)
     wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     wxWinHandleHash = new wxWinHashTable(wxKEY_INTEGER, 100);
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

-    wxSetKeyboardHook(TRUE);
+    wxSetKeyboardHook(true);

 #endif
 
     callBaseCleanup.Dismiss();
 #endif
 
     callBaseCleanup.Dismiss();


@@ -355,8 +360,8 @@ bool wxApp::RegisterWindowClasses()
     wndclass.hInstance     = wxhInstance;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
 
     wndclass.hInstance     = wxhInstance;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
 

-    // Register the frame window class.
-    wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
+    // register the class for all normal windows
+    wndclass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);

     wndclass.lpszClassName = wxCanvasClassName;
     wndclass.style         = styleNormal;
 
     wndclass.lpszClassName = wxCanvasClassName;
     wndclass.style         = styleNormal;
 


@@ -412,7 +417,7 @@ bool wxApp::RegisterWindowClasses()
         wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
     }
 
         wxLogLastError(wxT("RegisterClass(no redraw MDI child)"));
     }
 

-    return TRUE;
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -421,7 +426,7 @@ bool wxApp::RegisterWindowClasses()
 
 bool wxApp::UnregisterWindowClasses()
 {
 
 bool wxApp::UnregisterWindowClasses()
 {

-    bool retval = TRUE;
+    bool retval = true;

 
 #ifndef __WXMICROWIN__
     // MDI frame window class.
 
 #ifndef __WXMICROWIN__
     // MDI frame window class.


@@ -429,7 +434,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(MDI parent)"));
 
     {
         wxLogLastError(wxT("UnregisterClass(MDI parent)"));
 

-        retval = FALSE;
+        retval = false;

     }
 
     // "no redraw" MDI frame
     }
 
     // "no redraw" MDI frame


@@ -437,7 +442,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
 
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI parent frame)"));
 

-        retval = FALSE;
+        retval = false;

     }
 
     // MDI child frame window class.
     }
 
     // MDI child frame window class.


@@ -445,7 +450,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(MDI child)"));
 
     {
         wxLogLastError(wxT("UnregisterClass(MDI child)"));
 

-        retval = FALSE;
+        retval = false;

     }
 
     // "no redraw" MDI child frame
     }
 
     // "no redraw" MDI child frame


@@ -453,7 +458,7 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
 
     {
         wxLogLastError(wxT("UnregisterClass(no redraw MDI child)"));
 

-        retval = FALSE;
+        retval = false;

     }
 
     // canvas class name
     }
 
     // canvas class name


@@ -461,14 +466,14 @@ bool wxApp::UnregisterWindowClasses()
     {
         wxLogLastError(wxT("UnregisterClass(canvas)"));
 
     {
         wxLogLastError(wxT("UnregisterClass(canvas)"));
 

-        retval = FALSE;
+        retval = false;

     }
 
     if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
     {
         wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
 
     }
 
     if ( !::UnregisterClass(wxCanvasClassNameNR, wxhInstance) )
     {
         wxLogLastError(wxT("UnregisterClass(no redraw canvas)"));
 

-        retval = FALSE;
+        retval = false;

     }
 #endif // __WXMICROWIN__
 
     }
 #endif // __WXMICROWIN__
 


@@ -484,16 +489,13 @@ void wxApp::CleanUp()
     wxAppBase::CleanUp();
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)
     wxAppBase::CleanUp();
 
 #if !defined(__WXMICROWIN__) && !defined(__WXWINCE__)

-    wxSetKeyboardHook(FALSE);
+    wxSetKeyboardHook(false);

 #endif
 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 #endif
 
 #endif
 
 #if wxUSE_PENWINDOWS
     wxCleanUpPenWin();
 #endif
 

-    if ( wxDisableButtonBrush )
-        ::DeleteObject( wxDisableButtonBrush );
-

 #if wxUSE_OLE
 #ifdef __WXWINCE__
     ::CoUninitialize();
 #if wxUSE_OLE
 #ifdef __WXWINCE__
     ::CoUninitialize();


@@ -514,6 +516,11 @@ void wxApp::CleanUp()
 
     delete wxWinHandleHash;
     wxWinHandleHash = NULL;
 
     delete wxWinHandleHash;
     wxWinHandleHash = NULL;

+    
+#ifdef __WXWINCE__
+    free( wxCanvasClassName );
+    free( wxCanvasClassNameNR );
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -581,7 +588,7 @@ void wxApp::WakeUpIdle()
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())
 void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))
 {
     if (GetTopWindow())

-        GetTopWindow()->Close(TRUE);
+        GetTopWindow()->Close(true);

 }
 
 // Default behaviour: close the application with prompts. The
 }
 
 // Default behaviour: close the application with prompts. The


@@ -591,7 +598,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))
     if (GetTopWindow())
     {
         if (!GetTopWindow()->Close(!event.CanVeto()))

-            event.Veto(TRUE);
+            event.Veto(true);

     }
 }
 
     }
 }
 


@@ -602,8 +609,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 /* static */
 int wxApp::GetComCtl32Version()
 {
 /* static */
 int wxApp::GetComCtl32Version()
 {

-//FIX ME FOR DIGITALMARS!!
-#if defined(__WXMICROWIN__) || defined(__WXWINCE__) || defined(__DIGITALMARS__)
+#if defined(__WXMICROWIN__) || defined(__WXWINCE__)

     return 0;
 #else
     // cache the result
     return 0;
 #else
     // cache the result


@@ -690,7 +696,7 @@ int wxApp::GetComCtl32Version()
 bool wxApp::Yield(bool onlyIfNeeded)
 {
     // MT-FIXME
 bool wxApp::Yield(bool onlyIfNeeded)
 {
     // MT-FIXME

-    static bool s_inYield = FALSE;
+    static bool s_inYield = false;

 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't


@@ -705,10 +711,10 @@ bool wxApp::Yield(bool onlyIfNeeded)
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 
             wxFAIL_MSG( wxT("wxYield called recursively" ) );
         }
 

-        return FALSE;
+        return false;

     }
 
     }
 

-    s_inYield = TRUE;
+    s_inYield = true;

 
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it
 
     // we don't want to process WM_QUIT from here - it should be processed in
     // the main event loop in order to stop it


@@ -732,9 +738,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     wxLog::Resume();
 #endif // wxUSE_LOG
 
     wxLog::Resume();
 #endif // wxUSE_LOG
 

-    s_inYield = FALSE;
+    s_inYield = false;

 
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_EXCEPTIONS
 }
 
 #if wxUSE_EXCEPTIONS


@@ -746,7 +752,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 bool wxApp::OnExceptionInMainLoop()
 {
     // ask the user about what to do: use the Win32 API function here as it
 bool wxApp::OnExceptionInMainLoop()
 {
     // ask the user about what to do: use the Win32 API function here as it

-    // could be dangerous to use any wxWindows code in this state
+    // could be dangerous to use any wxWidgets code in this state

     switch (
             ::MessageBox
               (
     switch (
             ::MessageBox
               (


@@ -777,3 +783,33 @@ terminate the program,\r\n\
 }
 
 #endif // wxUSE_EXCEPTIONS
 }
 
 #endif // wxUSE_EXCEPTIONS

+
+// ----------------------------------------------------------------------------
+// deprecated event loop functions
+// ----------------------------------------------------------------------------
+
+#if WXWIN_COMPATIBILITY_2_4
+
+#include "wx/evtloop.h"
+
+void wxApp::DoMessage(WXMSG *pMsg)
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    if ( evtLoop )
+        evtLoop->ProcessMessage(pMsg);
+}
+
+bool wxApp::DoMessage()
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    return evtLoop ? evtLoop->Dispatch() : false;
+}
+
+bool wxApp::ProcessMessage(WXMSG* pMsg)
+{
+    wxEventLoop *evtLoop = wxEventLoop::GetActive();
+    return evtLoop && evtLoop->PreProcessMessage(pMsg);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+