char* -> wxString

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 70913744d685d5b66fec4ae9788e8f9aa16ce2ca..acb3f169f9e82906012ca257942716fdb7b1df1b 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -34,6 +34,7 @@
   #include "wx/dialog.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"
   #include "wx/dialog.h"
   #include "wx/msgdlg.h"
   #include "wx/intl.h"

+  #include "wx/dynarray.h"

 #endif
 
 #include "wx/msw/private.h"
 #endif
 
 #include "wx/msw/private.h"


@@ -59,15 +60,16 @@
 // if you don't do the same for the Ole calls further down.
 // Also, OLE is used not just for drag and drop (it's used by automatn.cpp).
 // #if wxUSE_DRAG_AND_DROP
 // if you don't do the same for the Ole calls further down.
 // Also, OLE is used not just for drag and drop (it's used by automatn.cpp).
 // #if wxUSE_DRAG_AND_DROP

-#if !defined(__GNUWIN32__) && !defined(__SC__)
+#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__)

 #include <ole2.h>
 #endif
 #include <ole2.h>
 #endif

+

 // #endif
 
 #include <string.h>
 #include <ctype.h>
 
 // #endif
 
 #include <string.h>
 #include <ctype.h>
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)

   #include <commctrl.h>
 #endif
 
   #include <commctrl.h>
 #endif
 


@@ -87,16 +89,15 @@
 
   /* Need to undef new if including crtdbg.h */
   #ifdef new
 
   /* Need to undef new if including crtdbg.h */
   #ifdef new

-  #undef new
+    #undef new

   #endif
 
   #include <crtdbg.h>
 
   #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS
   #endif
 
   #include <crtdbg.h>
 
   #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS && wxUSE_DEBUG_NEW_ALWAYS

-  #define new new(__FILE__,__LINE__)
+    #define new new(__FILE__,__LINE__)

   #endif
   #endif

-
-#endif
+#endif // wxUSE_VC_CRTDBG

 
 extern char *wxBuffer;
 extern char *wxOsVersion;
 
 extern char *wxBuffer;
 extern char *wxOsVersion;


@@ -116,15 +117,15 @@ char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass";
 char wxPanelClassName[]         = "wxPanelClass";
 char wxCanvasClassName[]        = "wxCanvasClass";
 
 char wxPanelClassName[]         = "wxPanelClass";
 char wxCanvasClassName[]        = "wxCanvasClass";
 

-HICON wxSTD_FRAME_ICON = NULL;
-HICON wxSTD_MDICHILDFRAME_ICON = NULL;
-HICON wxSTD_MDIPARENTFRAME_ICON = NULL;
+HICON wxSTD_FRAME_ICON = (HICON) NULL;
+HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
+HICON wxSTD_MDIPARENTFRAME_ICON = (HICON) NULL;

 
 

-HICON wxDEFAULT_FRAME_ICON = NULL;
-HICON wxDEFAULT_MDICHILDFRAME_ICON = NULL;
-HICON wxDEFAULT_MDIPARENTFRAME_ICON = NULL;
+HICON wxDEFAULT_FRAME_ICON = (HICON) NULL;
+HICON wxDEFAULT_MDICHILDFRAME_ICON = (HICON) NULL;
+HICON wxDEFAULT_MDIPARENTFRAME_ICON = (HICON) NULL;

 
 

-HBRUSH wxDisableButtonBrush = 0;
+HBRUSH wxDisableButtonBrush = (HBRUSH) 0;

 
 LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 
 
 LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 


@@ -140,8 +141,14 @@ LRESULT APIENTRY wxWndProc(HWND, UINT, WPARAM, LPARAM);
 
 long wxApp::sm_lastMessageTime = 0;
 
 
 long wxApp::sm_lastMessageTime = 0;
 

-#ifdef __WIN95__
-  static HINSTANCE gs_hRichEdit = NULL;
+#if defined(__WIN95__) && !defined(__TWIN32__)
+#define wxUSE_RICHEDIT 1
+#else
+#define wxUSE_RICHEDIT 0
+#endif
+
+#if wxUSE_RICHEDIT
+  static HINSTANCE gs_hRichEdit = (HINSTANCE) NULL;

 #endif
 
 //// Initialize
 #endif
 
 //// Initialize


@@ -183,23 +190,27 @@ bool wxApp::Initialize()
 
 #if defined(__WIN95__)
     InitCommonControls();
 
 #if defined(__WIN95__)
     InitCommonControls();

+
+#if wxUSE_RICHEDIT

     gs_hRichEdit = LoadLibrary("RICHED32.DLL");
 
     gs_hRichEdit = LoadLibrary("RICHED32.DLL");
 

-    if (gs_hRichEdit == NULL)
+    if (gs_hRichEdit == (HINSTANCE) NULL)

     {
       wxMessageBox("Could not initialise Rich Edit DLL");
     }
     {
       wxMessageBox("Could not initialise Rich Edit DLL");
     }

+#endif
+

 #endif
 
     int iMsg = 96;
 #endif
 
     int iMsg = 96;

-                       
+

    // for OLE, enlarge message queue to be as large as possible
    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
 
 /*
     DWORD dwOleVer;
     dwOleVer = CoBuildVersion();
    // for OLE, enlarge message queue to be as large as possible
    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
 
 /*
     DWORD dwOleVer;
     dwOleVer = CoBuildVersion();

-       
+

     // check the OLE library version
     if (rmm != HIWORD(dwOleVer))
     {
     // check the OLE library version
     if (rmm != HIWORD(dwOleVer))
     {


@@ -208,7 +219,7 @@ bool wxApp::Initialize()
     }
 */
 
     }
 */
 

-#if !defined(__GNUWIN32__) && !defined(__SC__)
+#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__)

     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
       wxFatalError(_("Cannot initialize OLE"));
     // we need to initialize OLE library
     if ( FAILED(::OleInitialize(NULL)) )
       wxFatalError(_("Cannot initialize OLE"));


@@ -249,8 +260,7 @@ bool wxApp::Initialize()
 
     // This is to foil optimizations in Visual C++ that
     // throw out dummy.obj.
 
     // This is to foil optimizations in Visual C++ that
     // throw out dummy.obj.

-// #if (_MSC_VER >= 800) && !defined(WXMAKINGDLL)
-#if defined(_MSC_VER) && defined(__WIN16__) && !defined(WXMAKINGDLL)
+#if 0 && defined(_MSC_VER) && !defined(WXMAKINGDLL)

     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif
     extern char wxDummyChar;
     if (wxDummyChar) wxDummyChar++;
 #endif


@@ -276,8 +286,8 @@ bool wxApp::RegisterWindowClasses()
   wndclass.cbClsExtra    = 0;
   wndclass.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass.hInstance     = wxhInstance;
   wndclass.cbClsExtra    = 0;
   wndclass.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass.hInstance     = wxhInstance;

-  wndclass.hIcon         = NULL;        // wxSTD_FRAME_ICON;
-  wndclass.hCursor       = LoadCursor( NULL, IDC_ARROW );
+  wndclass.hIcon         = (HICON) NULL;        // wxSTD_FRAME_ICON;
+  wndclass.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );

   wndclass.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
 //  wndclass.hbrBackground = GetStockObject( WHITE_BRUSH );
   wndclass.lpszMenuName  = NULL;
   wndclass.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
 //  wndclass.hbrBackground = GetStockObject( WHITE_BRUSH );
   wndclass.lpszMenuName  = NULL;


@@ -300,10 +310,10 @@ bool wxApp::RegisterWindowClasses()
   wndclass1.cbClsExtra    = 0;
   wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass1.hInstance     = wxhInstance;
   wndclass1.cbClsExtra    = 0;
   wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass1.hInstance     = wxhInstance;

-  wndclass1.hIcon         = NULL; // wxSTD_MDIPARENTFRAME_ICON;
-  wndclass1.hCursor       = LoadCursor( NULL, IDC_ARROW );
+  wndclass1.hIcon         = (HICON) NULL; // wxSTD_MDIPARENTFRAME_ICON;
+  wndclass1.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );

 //  wndclass1.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;
 //  wndclass1.hbrBackground =  (HBRUSH)(COLOR_APPWORKSPACE+1) ;

-  wndclass1.hbrBackground = NULL;
+  wndclass1.hbrBackground = (HBRUSH) NULL;

   wndclass1.lpszMenuName  = NULL;
 
   wndclass1.lpszClassName = wxMDIFrameClassName;
   wndclass1.lpszMenuName  = NULL;
 
   wndclass1.lpszClassName = wxMDIFrameClassName;


@@ -322,8 +332,8 @@ bool wxApp::RegisterWindowClasses()
   wndclass4.cbClsExtra    = 0;
   wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass4.hInstance     = wxhInstance;
   wndclass4.cbClsExtra    = 0;
   wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass4.hInstance     = wxhInstance;

-  wndclass4.hIcon         = NULL;       // wxSTD_MDICHILDFRAME_ICON;
-  wndclass4.hCursor       = LoadCursor( NULL, IDC_ARROW );
+  wndclass4.hIcon         = (HICON) NULL;       // wxSTD_MDICHILDFRAME_ICON;
+  wndclass4.hCursor       = LoadCursor( (HINSTANCE) NULL, IDC_ARROW );

   // TODO: perhaps this should be NULL so that Windows doesn't
   // paint the background itself (would OnEraseBackground duplicate
   // this?)
   // TODO: perhaps this should be NULL so that Windows doesn't
   // paint the background itself (would OnEraseBackground duplicate
   // this?)


@@ -349,8 +359,8 @@ bool wxApp::RegisterWindowClasses()
   wndclass2.cbClsExtra    = 0;
   wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass2.hInstance     = wxhInstance;
   wndclass2.cbClsExtra    = 0;
   wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass2.hInstance     = wxhInstance;

-  wndclass2.hIcon         = NULL;
-  wndclass2.hCursor       = NULL;
+  wndclass2.hIcon         = (HICON) NULL;
+  wndclass2.hCursor       = (HCURSOR) NULL;

 //  wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
   wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
   wndclass2.lpszMenuName  = NULL;
 //  wndclass2.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1) ;
   wndclass2.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
   wndclass2.lpszMenuName  = NULL;


@@ -374,10 +384,10 @@ bool wxApp::RegisterWindowClasses()
   wndclass3.cbClsExtra    = 0;
   wndclass3.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass3.hInstance     = wxhInstance;
   wndclass3.cbClsExtra    = 0;
   wndclass3.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass3.hInstance     = wxhInstance;

-  wndclass3.hIcon         = NULL;
-  wndclass3.hCursor       = NULL;
+  wndclass3.hIcon         = (HICON) NULL;
+  wndclass3.hCursor       = (HCURSOR) NULL;

 //  wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;
 //  wndclass3.hbrBackground = (HBRUSH)(COLOR_WINDOW+1) ;

-  wndclass3.hbrBackground = NULL;
+  wndclass3.hbrBackground = (HBRUSH) NULL;

   wndclass3.lpszMenuName  = NULL;
   wndclass3.lpszClassName = wxCanvasClassName;
   if (!RegisterClass( &wndclass3))
   wndclass3.lpszMenuName  = NULL;
   wndclass3.lpszClassName = wxCanvasClassName;
   if (!RegisterClass( &wndclass3))


@@ -501,10 +511,14 @@ void wxApp::CleanUp()
   wxSetKeyboardHook(FALSE);
 
 #ifdef __WIN95__
   wxSetKeyboardHook(FALSE);
 
 #ifdef __WIN95__

-  if (gs_hRichEdit != NULL)
+
+#if wxUSE_RICHEDIT
+  if (gs_hRichEdit != (HINSTANCE) NULL)

     FreeLibrary(gs_hRichEdit);
 #endif
 
     FreeLibrary(gs_hRichEdit);
 #endif
 

+#endif
+

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


@@ -526,7 +540,7 @@ void wxApp::CleanUp()
   if ( wxDisableButtonBrush )
     ::DeleteObject( wxDisableButtonBrush ) ;
 
   if ( wxDisableButtonBrush )
     ::DeleteObject( wxDisableButtonBrush ) ;
 

-#if !defined(__GNUWIN32__) && !defined(__SC__)
+#if !defined(__GNUWIN32__) && !defined(__SC__) && !defined(__SALFORDC__)

   ::OleUninitialize();
 #endif
 
   ::OleUninitialize();
 #endif
 


@@ -563,6 +577,11 @@ void wxApp::CleanUp()
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 
 
 #if !defined(_WINDLL) || (defined(_WINDLL) && defined(WXMAKINGDLL))
 

+// temporarily disable this warning
+#ifdef _MSC_VER
+    #pragma warning(disable: 4715) // not all control paths return a value
+#endif // Visual C++
+

 //// Main wxWindows entry point
 int wxEntry(WXHINSTANCE hInstance,
             WXHINSTANCE WXUNUSED(hPrevInstance),
 //// Main wxWindows entry point
 int wxEntry(WXHINSTANCE hInstance,
             WXHINSTANCE WXUNUSED(hPrevInstance),


@@ -570,8 +589,16 @@ int wxEntry(WXHINSTANCE hInstance,
             int nCmdShow,
             bool enterLoop)
 {
             int nCmdShow,
             bool enterLoop)
 {

-#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) && !defined(__WATCOMC__) // take everything into a try-except block in release build
-  try {
+  // take everything into a try-except block in release build
+  // FIXME other compilers must support Win32 SEH (structured exception
+  //       handling) too, just find the appropriate keyword in their docs!
+  //       Please note that it's _not_ the same as C++ exceptions!
+#if !defined(__WXDEBUG__) && defined(_MSC_VER)
+    #define CATCH_PROGRAM_EXCEPTIONS
+
+  __try {
+#else
+    #undef  CATCH_PROGRAM_EXCEPTIONS

 #endif
 
   wxhInstance = (HINSTANCE) hInstance;
 #endif
 
   wxhInstance = (HINSTANCE) hInstance;


@@ -640,20 +667,27 @@ int wxEntry(WXHINSTANCE hInstance,
   wxApp::CleanUp();
 
   return retValue;
   wxApp::CleanUp();
 
   return retValue;

-#if !defined(__WXDEBUG__) && !defined(__BORLANDC__) && !defined(__WATCOMC__) // catch exceptions only in release build
+
+#ifdef CATCH_PROGRAM_EXCEPTIONS

   }
   }

-  except ( EXCEPTION_EXECUTE_HANDLER ) {
+  __except ( EXCEPTION_EXECUTE_HANDLER ) {

     /*
     if ( wxTheApp )
       wxTheApp->OnFatalException();
     */
 
     ::ExitProcess(3); // the same exit code as abort()
     /*
     if ( wxTheApp )
       wxTheApp->OnFatalException();
     */
 
     ::ExitProcess(3); // the same exit code as abort()

-    return 0;
+
+    // NOTREACHED

   }
   }

-#endif //debug
+#endif // CATCH_PROGRAM_EXCEPTIONS

 }
 
 }
 

+// restore warning state
+#ifdef _MSC_VER
+    #pragma warning(default: 4715) // not all control paths return a value
+#endif // Visual C++
+

 #else /*  _WINDLL  */
 
 //// Entry point for DLLs
 #else /*  _WINDLL  */
 
 //// Entry point for DLLs


@@ -756,7 +790,7 @@ bool wxApp::DoMessage()
     {
         // got WM_QUIT
         m_keepGoing = FALSE;
     {
         // got WM_QUIT
         m_keepGoing = FALSE;

-        
+

         return FALSE;
     }
     else if ( rc == -1 )
         return FALSE;
     }
     else if ( rc == -1 )


@@ -780,7 +814,13 @@ bool wxApp::DoMessage()
         {
             s_hadGuiLock = FALSE;
 
         {
             s_hadGuiLock = FALSE;
 

-            s_aSavedMessages.Add(s_currentMsg);
+            // leave out WM_COMMAND messages: too dangerous, sometimes
+            // the message will be processed twice
+            if ( !wxIsWaitingForThread() ||
+                 s_currentMsg.message != WM_COMMAND )
+            {
+                s_aSavedMessages.Add(s_currentMsg);
+            }

 
             return TRUE;
         }
 
             return TRUE;
         }


@@ -897,7 +937,7 @@ bool wxApp::ProcessMessage(WXMSG *Msg)
 
   // Try translations first; find the youngest window with
   // a translation table.
 
   // Try translations first; find the youngest window with
   // a translation table.

-  for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
+  for (hWnd = msg->hwnd; hWnd != (HWND) NULL; hWnd = ::GetParent(hWnd))

   {
     wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
     if (wnd)
   {
     wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
     if (wnd)


@@ -908,7 +948,7 @@ bool wxApp::ProcessMessage(WXMSG *Msg)
   }
 
   // Anyone for a non-translation message? Try youngest descendants first.
   }
 
   // Anyone for a non-translation message? Try youngest descendants first.

-  for (hWnd = msg->hwnd; hWnd != NULL; hWnd = ::GetParent(hWnd))
+  for (hWnd = msg->hwnd; hWnd != (HWND) NULL; hWnd = ::GetParent(hWnd))

   {
     wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
     if (wnd)
   {
     wxWindow *wnd = wxFindWinFromHandle((WXHWND) hWnd);
     if (wnd)


@@ -1008,7 +1048,7 @@ void wxApp::DeletePendingObjects()
   }
 }
 
   }
 }
 

-void wxApp::OnEndSession(wxCloseEvent& event)
+void wxApp::OnEndSession(wxCloseEvent& WXUNUSED(event))

 {
     if (GetTopWindow())
         GetTopWindow()->Close(TRUE);
 {
     if (GetTopWindow())
         GetTopWindow()->Close(TRUE);


@@ -1111,6 +1151,6 @@ HINSTANCE wxGetInstance()
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.
 
 // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly
 // if in a separate file. So include it here to ensure it's linked.

-#if (defined(_MSC_VER) && !defined(__WIN32__)) || defined(__GNUWIN32__)
+#if (defined(_MSC_VER) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))

   #include "main.cpp"
 #endif
   #include "main.cpp"
 #endif