Applied a few old patches,

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 6305cb017f97bb23b10986a000e36215dd7a63d5..d1a70a3d3c8de29eaa0b6aa316aee2b7c607941e 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -19,6 +19,7 @@
 
 #ifdef __GNUG__
     #pragma implementation "app.h"
 
 #ifdef __GNUG__
     #pragma implementation "app.h"

+    #pragma implementation "appbase.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -43,12 +44,15 @@
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"
     #include "wx/msgdlg.h"
     #include "wx/intl.h"
     #include "wx/dynarray.h"

+#   include "wx/wxchar.h"
+#   include "wx/icon.h"

 #endif
 
 #endif
 

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

 #include "wx/log.h"
 #include "wx/module.h"
 
 #include "wx/log.h"
 #include "wx/module.h"
 

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

 #if wxUSE_THREADS
     #include "wx/thread.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
 


@@ -65,11 +69,13 @@
 #endif
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation...
 #endif
 
 // OLE is used for drag-and-drop, clipboard, OLE Automation...

+#ifndef wxUSE_NORLANDER_HEADERS

 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers
 #if defined(__GNUWIN32__) || defined(__SC__) || defined(__SALFORDC__)
     #undef wxUSE_OLE
 
     #define  wxUSE_OLE 0
 #endif // broken compilers

+#endif

 
 #if wxUSE_OLE
     #include <ole2.h>
 
 #if wxUSE_OLE
     #include <ole2.h>


@@ -78,7 +84,7 @@
 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 

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

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


@@ -88,8 +94,8 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // global variables
 // ---------------------------------------------------------------------------
 

-extern char *wxBuffer;
-extern char *wxOsVersion;
+extern wxChar *wxBuffer;
+extern wxChar *wxOsVersion;

 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 #if wxUSE_THREADS
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 #if wxUSE_THREADS


@@ -104,11 +110,17 @@ MSG s_currentMsg;
 wxApp *wxTheApp = NULL;
 
 // FIXME why not const? and not static?
 wxApp *wxTheApp = NULL;
 
 // FIXME why not const? and not static?

-char wxFrameClassName[]         = "wxFrameClass";
-char wxMDIFrameClassName[]      = "wxMDIFrameClass";
-char wxMDIChildFrameClassName[] = "wxMDIChildFrameClass";
-char wxPanelClassName[]         = "wxPanelClass";
-char wxCanvasClassName[]        = "wxCanvasClass";
+
+// NB: all "NoRedraw" classes must have the same names as the "normal" classes
+//     with NR suffix - wxWindow::MSWCreate() supposes this
+wxChar wxFrameClassName[]         = _T("wxFrameClass");
+wxChar wxFrameClassNameNoRedraw[] = _T("wxFrameClassNR");
+wxChar wxMDIFrameClassName[]      = _T("wxMDIFrameClass");
+wxChar wxMDIFrameClassNameNoRedraw[] = _T("wxMDIFrameClassNR");
+wxChar wxMDIChildFrameClassName[] = _T("wxMDIChildFrameClass");
+wxChar wxMDIChildFrameClassNameNoRedraw[] = _T("wxMDIChildFrameClassNR");
+wxChar wxPanelClassName[]         = _T("wxPanelClass");
+wxChar wxCanvasClassName[]        = _T("wxCanvasClass");

 
 HICON wxSTD_FRAME_ICON = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;
 
 HICON wxSTD_FRAME_ICON = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;


@@ -159,12 +171,12 @@ bool wxApp::Initialize()
     //    wxRedirectIOToConsole();
 #endif
 
     //    wxRedirectIOToConsole();
 #endif
 

-    wxBuffer = new char[1500]; // FIXME
+    wxBuffer = new wxChar[1500]; // FIXME

 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
 
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES

-    wxGetResource("wxWindows", "OsVersion", &wxOsVersion);
+    wxGetResource(_T("wxWindows"), _T("OsVersion"), &wxOsVersion);

 #endif
 
     // I'm annoyed ... I don't know where to put this and I don't want to
 #endif
 
     // I'm annoyed ... I don't know where to put this and I don't want to


@@ -190,7 +202,7 @@ bool wxApp::Initialize()
     InitCommonControls();
 
 #if wxUSE_RICHEDIT
     InitCommonControls();
 
 #if wxUSE_RICHEDIT

-    gs_hRichEdit = LoadLibrary("RICHED32.DLL");
+    gs_hRichEdit = LoadLibrary(_T("RICHED32.DLL"));

 
     if (gs_hRichEdit == (HINSTANCE) NULL)
     {
 
     if (gs_hRichEdit == (HINSTANCE) NULL)
     {


@@ -200,32 +212,35 @@ bool wxApp::Initialize()
 
 #endif // __WIN95__
 
 
 #endif // __WIN95__
 

+#if wxUSE_OLE
+
+#ifdef __WIN16__

     // for OLE, enlarge message queue to be as large as possible
     int iMsg = 96;
     // for OLE, enlarge message queue to be as large as possible
     int iMsg = 96;

-    while (!SetMessageQueue(iMsg) && (iMsg -= 8));
-
-#if wxUSE_OLE
+    while (!SetMessageQueue(iMsg) && (iMsg -= 8))
+        ;
+#endif // Win16

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

-#endif
+#endif // wxUSE_OLE

 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))
 
 #if wxUSE_CTL3D
     if (!Ctl3dRegister(wxhInstance))

-        wxLogError("Cannot register CTL3D");
+        wxLogError(_T("Cannot register CTL3D"));

 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 
 
     Ctl3dAutoSubclass(wxhInstance);
 #endif
 
     g_globalCursor = new wxCursor;
 

-    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, "wxSTD_FRAME");
-    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDIPARENTFRAME");
-    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxSTD_MDICHILDFRAME");
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDICHILDFRAME"));

 
 

-    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_FRAME");
-    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDIPARENTFRAME");
-    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, "wxDEFAULT_MDICHILDFRAME");
+    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxDEFAULT_MDICHILDFRAME"));

 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 


@@ -233,9 +248,13 @@ bool wxApp::Initialize()
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;

-    lb.lbHatch = (int)LoadBitmap( wxhInstance, "wxDISABLE_BUTTON_BITMAP" );
-    wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
-    ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") );
+    if ( lb.lbHatch )
+    {
+        wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
+        ::DeleteObject( (HGDIOBJ)lb.lbHatch );
+    }
+    //else: wxWindows resources are probably not linked in

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


@@ -266,11 +285,15 @@ bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 
 {
     WNDCLASS wndclass;
 

+    // for each class we register one with CS_(V|H)REDRAW style and one
+    // without for windows created with wxNO_FULL_REDRAW_ON_REPAINT flag
+    static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
+    static const long styleNoRedraw = CS_DBLCLKS;
+

     // the fields which are common to all classes
     // the fields which are common to all classes

-    wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;

     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;
     wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
     wndclass.cbClsExtra    = 0;

-    wndclass.cbWndExtra    = sizeof( DWORD ); // what is this DWORD used for?
+    wndclass.cbWndExtra    = sizeof( DWORD ); // VZ: what is this DWORD used for?

     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);
     wndclass.hInstance     = wxhInstance;
     wndclass.hIcon         = (HICON) NULL;
     wndclass.hCursor       = ::LoadCursor((HINSTANCE)NULL, IDC_ARROW);


@@ -278,9 +301,7 @@ bool wxApp::RegisterWindowClasses()
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);
 
     // Register the frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_APPWORKSPACE + 1);

-#ifdef _MULTIPLE_INSTANCES
-    sprintf( wxFrameClassName,"wxFrameClass%d", wxhInstance );
-#endif
+    wndclass.style         = styleNormal;

     wndclass.lpszClassName = wxFrameClassName;
 
     if ( !RegisterClass(&wndclass) )
     wndclass.lpszClassName = wxFrameClassName;
 
     if ( !RegisterClass(&wndclass) )


@@ -290,9 +311,20 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" frame
+    wndclass.lpszClassName = wxFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw frame)");
+
+        return FALSE;
+    }
+

     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves

-    wndclass.lpszClassName = wxMDIFrameClassName;
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;

 
     if ( !RegisterClass(&wndclass) )
     {
 
     if ( !RegisterClass(&wndclass) )
     {


@@ -301,6 +333,17 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassName;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw MDI parent frame)");
+
+        return FALSE;
+    }
+

     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;
     // Register the MDI child frame window class.
     wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndclass.lpszClassName = wxMDIChildFrameClassName;


@@ -312,6 +355,17 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" MDI child frame
+    wndclass.lpszClassName = wxMDIChildFrameClassNameNoRedraw;
+    wndclass.style         = styleNoRedraw;
+
+    if ( !RegisterClass(&wndclass) )
+    {
+        wxLogLastError("RegisterClass(no redraw MDI child)");
+
+        return FALSE;
+    }
+

     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;
     // Register the panel window class.
     wndclass.hbrBackground = (HBRUSH) GetStockObject( LTGRAY_BRUSH );
     wndclass.lpszClassName = wxPanelClassName;


@@ -349,13 +403,13 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     int count = 0;
 
     // Get application name
     int count = 0;
 
     // Get application name

-    char name[260]; // 260 is MAX_PATH value from windef.h
+    wxChar name[260]; // 260 is MAX_PATH value from windef.h

     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 
     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     args.Add(name);
     count++;
 

-    strcpy(name, wxFileNameFromPath(name));
+    wxStrcpy(name, wxFileNameFromPath(name));

     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 
     wxStripExtension(name);
     wxTheApp->SetAppName(name);
 


@@ -366,16 +420,16 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     while (i < len)
     {
         // Skip whitespace
     while (i < len)
     {
         // Skip whitespace

-        while ((i < len) && isspace(cmdLine.GetChar(i)))
+        while ((i < len) && wxIsspace(cmdLine.GetChar(i)))

             i ++;
 
         if (i < len)
         {
             i ++;
 
         if (i < len)
         {

-            if (cmdLine.GetChar(i) == '"') // We found the start of a string
+            if (cmdLine.GetChar(i) == _T('"')) // We found the start of a string

             {
                 i ++;
                 int first = i;
             {
                 i ++;
                 int first = i;

-                while ((i < len) && (cmdLine.GetChar(i) != '"'))
+                while ((i < len) && (cmdLine.GetChar(i) != _T('"')))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -389,7 +443,7 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
             else // Unquoted argument
             {
                 int first = i;
             else // Unquoted argument
             {
                 int first = i;

-                while ((i < len) && !isspace(cmdLine.GetChar(i)))
+                while ((i < len) && !wxIsspace(cmdLine.GetChar(i)))

                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));
                     i ++;
 
                 wxString arg(cmdLine.Mid(first, (i - first)));


@@ -400,11 +454,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
         }
     }
 
         }
     }
 

-    wxTheApp->argv = new char*[count + 1];
+    wxTheApp->argv = new wxChar*[count + 1];

     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);
     for (i = 0; i < count; i++)
     {
         wxString arg(args[i]);

-        wxTheApp->argv[i] = copystring((const char*)arg);
+        wxTheApp->argv[i] = copystring((const wxChar*)arg);

     }
     wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
     wxTheApp->argc = count;
     }
     wxTheApp->argv[count] = NULL; // argv[] is a NULL-terminated list
     wxTheApp->argc = count;


@@ -524,7 +578,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.");
+        wxLogDebug(_T("There were memory leaks."));

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -581,12 +635,12 @@ int wxEntry(WXHINSTANCE hInstance,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,
             // the IMPLEMENT_APP macro is used instead, which sets an initializer
             // function for delayed, dynamic app object construction.
             wxCHECK_MSG( wxApp::GetInitializerFunction(), 0,

-                         "No initializer - use IMPLEMENT_APP macro." );
+                         _T("No initializer - use IMPLEMENT_APP macro.") );

 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 
 
             wxTheApp = (*wxApp::GetInitializerFunction()) ();
         }
 

-        wxCHECK_MSG( wxTheApp, 0, "You have to define an instance of wxApp!" );
+        wxCHECK_MSG( wxTheApp, 0, _T("You have to define an instance of wxApp!") );

 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);
 
         // save the WinMain() parameters
         wxTheApp->ConvertToStandardCommandArgs(lpCmdLine);


@@ -701,7 +755,7 @@ int wxEntry(WXHINSTANCE hInstance)
 
 //// Static member initialization
 
 
 //// Static member initialization
 

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 wxApp::wxApp()
 {
 
 wxApp::wxApp()
 {


@@ -764,7 +818,7 @@ bool wxApp::DoMessage()
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),
     {
 #if wxUSE_THREADS
         wxASSERT_MSG( wxThread::IsMain(),

-                      "only the main thread can process Windows messages" );
+                      _T("only the main thread can process Windows messages") );

 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;
 
         static bool s_hadGuiLock = TRUE;
         static wxMsgArray s_aSavedMessages;


@@ -917,6 +971,15 @@ bool wxApp::ProcessMessage(WXMSG *wxmsg)
     HWND hWnd = msg->hwnd;
     wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
 
     HWND hWnd = msg->hwnd;
     wxWindow *wndThis = wxFindWinFromHandle((WXHWND)hWnd), *wnd;
 

+    // for some composite controls (like a combobox), wndThis might be NULL
+    // because the subcontrol is not a wxWindow, but only the control itself
+    // is - try to catch this case
+    while ( hWnd && !wndThis )
+    {
+        hWnd = ::GetParent(hWnd);
+        wndThis = wxFindWinFromHandle((WXHWND)hWnd);        
+    }
+

     // Try translations first; find the youngest window with
     // a translation table.
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )
     // Try translations first; find the youngest window with
     // a translation table.
     for ( wnd = wndThis; wnd; wnd = wnd->GetParent() )


@@ -1046,25 +1109,10 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
     }
 }
 
     }
 }
 

-wxLog* wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
-    else
-        return NULL;
-}
-

 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?

-    HMODULE theModule = ::GetModuleHandle("COMCTL32");
+    HMODULE theModule = ::GetModuleHandle(_T("COMCTL32"));

     int version = 0;
 
     // if so, then we can check for the version
     int version = 0;
 
     // if so, then we can check for the version


@@ -1134,6 +1182,30 @@ bool wxYield()
     return TRUE;
 }
 
     return TRUE;
 }
 

+wxIcon
+wxApp::GetStdIcon(int which) const
+{
+    switch(which)
+    {
+        case wxICON_INFORMATION:
+            return wxIcon("wxICON_INFO");
+
+        case wxICON_QUESTION:
+            return wxIcon("wxICON_QUESTION");
+
+        case wxICON_EXCLAMATION:
+            return wxIcon("wxICON_WARNING");
+
+        default:
+            wxFAIL_MSG(_T("requested non existent standard icon"));
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon("wxICON_ERROR");
+    }
+}
+
+

 HINSTANCE wxGetInstance()
 {
     return wxhInstance;
 HINSTANCE wxGetInstance()
 {
     return wxhInstance;