minor bug fixes

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 5cde142a7541d186e4b3ad7fe7d4ca35fc33399b..76ef09c046d5cf9d56484e472a82ec3b028fa1c1 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -43,8 +43,8 @@
     #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"
+    #include "wx/wxchar.h"
+    #include "wx/icon.h"

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


@@ -68,11 +68,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>


@@ -81,7 +83,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
 


@@ -95,10 +97,6 @@ extern wxChar *wxBuffer;
 extern wxChar *wxOsVersion;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxChar *wxOsVersion;
 extern wxList *wxWinHandleList;
 extern wxList WXDLLEXPORT wxPendingDelete;

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif

 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 
 extern void wxSetKeyboardHook(bool doIt);
 extern wxCursor *g_globalCursor;
 


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

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


@@ -167,14 +171,11 @@ bool wxApp::Initialize()
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES
     wxClassInfo::InitializeClasses();
 
 #if wxUSE_RESOURCES

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

 #endif
 
 #endif
 

-    // I'm annoyed ... I don't know where to put this and I don't want to
-    // create a module for that as it's part of the core.

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    wxPendingEvents = new wxList();
-    wxPendingEventsLocker = new wxCriticalSection();
+    wxPendingEventsLocker = new wxCriticalSection;

 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
 #endif
 
     wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);


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

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

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


@@ -203,32 +204,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(_T("Cannot register CTL3D"));
+        wxLogError(wxT("Cannot register CTL3D"));

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

-    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_FRAME"));
-    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDIPARENTFRAME"));
-    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, _T("wxSTD_MDICHILDFRAME"));
+    wxSTD_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_FRAME"));
+    wxSTD_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_MDIPARENTFRAME"));
+    wxSTD_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxSTD_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"));
+    wxDEFAULT_FRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_FRAME"));
+    wxDEFAULT_MDIPARENTFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDIPARENTFRAME"));
+    wxDEFAULT_MDICHILDFRAME_ICON = LoadIcon(wxhInstance, wxT("wxDEFAULT_MDICHILDFRAME"));

 
     RegisterWindowClasses();
 
 
     RegisterWindowClasses();
 


@@ -236,7 +240,7 @@ bool wxApp::Initialize()
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;
 
     LOGBRUSH lb;
     lb.lbStyle = BS_PATTERN;

-    lb.lbHatch = (int)LoadBitmap( wxhInstance, _T("wxDISABLE_BUTTON_BITMAP") );
+    lb.lbHatch = (int)LoadBitmap( wxhInstance, wxT("wxDISABLE_BUTTON_BITMAP") );

     if ( lb.lbHatch )
     {
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );
     if ( lb.lbHatch )
     {
         wxDisableButtonBrush = ::CreateBrushIndirect( & lb );


@@ -269,15 +273,22 @@ bool wxApp::Initialize()
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 
 // RegisterWindowClasses
 // ---------------------------------------------------------------------------
 

+// TODO we should only register classes really used by the app. For this it
+//      would be enough to just delay the class registration until an attempt
+//      to create a window of this class is made.

 bool wxApp::RegisterWindowClasses()
 {
     WNDCLASS wndclass;
 
 bool wxApp::RegisterWindowClasses()
 {
     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);


@@ -285,10 +296,8 @@ 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.lpszClassName = wxFrameClassName;
     wndclass.lpszClassName = wxFrameClassName;

+    wndclass.style         = styleNormal;

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


@@ -297,9 +306,21 @@ 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
     wndclass.lpszClassName = wxMDIFrameClassName;
     // Register the MDI frame window class.
     wndclass.hbrBackground = (HBRUSH)NULL; // paint MDI frame ourselves
     wndclass.lpszClassName = wxMDIFrameClassName;

+    wndclass.style         = styleNormal;

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


@@ -308,9 +329,21 @@ bool wxApp::RegisterWindowClasses()
         return FALSE;
     }
 
         return FALSE;
     }
 

+    // "no redraw" MDI frame
+    wndclass.lpszClassName = wxMDIFrameClassNameNoRedraw;
+    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;

+    wndclass.style         = styleNormal;

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


@@ -319,9 +352,21 @@ 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;

+    wndclass.style         = styleNormal;

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


@@ -378,11 +423,11 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 
         if (i < len)
         {
 
         if (i < len)
         {

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

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

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

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


@@ -512,8 +557,8 @@ void wxApp::CleanUp()
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to 
     // create a module for that as it's part of the core.
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to 
     // create a module for that as it's part of the core.

-#if wxUSE_THREADS

     delete wxPendingEvents;
     delete wxPendingEvents;

+#if wxUSE_THREADS

     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();
     delete wxPendingEventsLocker;
     // If we don't do the following, we get an apparent memory leak.
     ((wxEvtHandler&) wxDefaultValidator).ClearEventLocker();


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

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

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


@@ -588,12 +633,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,

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

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

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

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


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

-                      _T("only the main thread can process Windows messages") );
+                      wxT("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;


@@ -878,25 +923,6 @@ bool wxApp::ProcessIdle()
     return event.MoreRequested();
 }
 
     return event.MoreRequested();
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-        node = wxPendingEvents->First();
-    }
-}
-#endif
-
-

 void wxApp::ExitMainLoop()
 {
     m_keepGoing = FALSE;
 void wxApp::ExitMainLoop()
 {
     m_keepGoing = FALSE;


@@ -979,10 +1005,11 @@ void wxApp::OnIdle(wxIdleEvent& event)
         event.RequestMore(TRUE);
     }
 
         event.RequestMore(TRUE);
     }
 

-    // If they are pending events, we must process them.
-#if wxUSE_THREADS
+    // If they are pending events, we must process them: pending events are
+    // either events to the threads other than main or events posted with
+    // wxPostEvent() functions

     ProcessPendingEvents();
     ProcessPendingEvents();

-#endif
+

     s_inOnIdle = FALSE;
 }
 
     s_inOnIdle = FALSE;
 }
 


@@ -1065,7 +1092,7 @@ void wxApp::OnQueryEndSession(wxCloseEvent& event)
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?
 int wxApp::GetComCtl32Version() const
 {
     // have we loaded COMCTL32 yet?

-    HMODULE theModule = ::GetModuleHandle(_T("COMCTL32"));
+    HMODULE theModule = ::GetModuleHandle(wxT("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


@@ -1115,22 +1142,19 @@ void wxExit()
 // Yield to incoming messages
 bool wxYield()
 {
 // Yield to incoming messages
 bool wxYield()
 {

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

     MSG msg;
     MSG msg;

-    // We want to go back to the main message loop
-    // if we see a WM_QUIT. (?)
-#ifdef __WXWINE__
-    while (PeekMessage(&msg, (HWND)NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-#else
-    while (PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) && msg.message != WM_QUIT)
-#endif
+    while ( PeekMessage(&msg, (HWND)0, 0, 0, PM_NOREMOVE) &&
+            msg.message != WM_QUIT )

     {
         if ( !wxTheApp->DoMessage() )
             break;
     }
     {
         if ( !wxTheApp->DoMessage() )
             break;
     }

+

     // If they are pending events, we must process them.
     // If they are pending events, we must process them.

-#if wxUSE_THREADS

     wxTheApp->ProcessPendingEvents();
     wxTheApp->ProcessPendingEvents();

-#endif

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1150,7 +1174,7 @@ wxApp::GetStdIcon(int which) const
             return wxIcon("wxICON_WARNING");
 
         default:
             return wxIcon("wxICON_WARNING");
 
         default:

-            wxFAIL_MSG(_T("requested non existent standard icon"));
+            wxFAIL_MSG(wxT("requested non existent standard icon"));

             // still fall through
 
         case wxICON_HAND:
             // still fall through
 
         case wxICON_HAND: