wxListCtrl column resize bug corrected

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

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index a3301a60857d6de7b33fa4ad242462f4b2358947..ba4a42af25a08958b3e8eae381e2e0e7e51f00d7 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -248,7 +248,7 @@ bool wxApp::RegisterWindowClasses()
 // Register the frame window class.
   WNDCLASS wndclass;   // Structure used to register Windows class.
 
 // Register the frame window class.
   WNDCLASS wndclass;   // Structure used to register Windows class.
 

-  wndclass.style         = CS_HREDRAW | CS_VREDRAW;
+  wndclass.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;

   wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass.cbClsExtra    = 0;
   wndclass.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass.cbClsExtra    = 0;
   wndclass.cbWndExtra    = sizeof( DWORD ); // was 4


@@ -272,7 +272,7 @@ bool wxApp::RegisterWindowClasses()
 // Register the MDI frame window class.
   WNDCLASS wndclass1;   // Structure used to register Windows class.
 
 // Register the MDI frame window class.
   WNDCLASS wndclass1;   // Structure used to register Windows class.
 

-  wndclass1.style         = CS_HREDRAW | CS_VREDRAW;
+  wndclass1.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;

   wndclass1.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass1.cbClsExtra    = 0;
   wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass1.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass1.cbClsExtra    = 0;
   wndclass1.cbWndExtra    = sizeof( DWORD ); // was 4


@@ -294,7 +294,7 @@ bool wxApp::RegisterWindowClasses()
 // Register the MDI child frame window class.
   WNDCLASS wndclass4;   // Structure used to register Windows class.
 
 // Register the MDI child frame window class.
   WNDCLASS wndclass4;   // Structure used to register Windows class.
 

-  wndclass4.style         = CS_HREDRAW | CS_VREDRAW;
+  wndclass4.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;

   wndclass4.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass4.cbClsExtra    = 0;
   wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass4.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass4.cbClsExtra    = 0;
   wndclass4.cbWndExtra    = sizeof( DWORD ); // was 4


@@ -319,9 +319,7 @@ bool wxApp::RegisterWindowClasses()
 // Register the panel window class.
   WNDCLASS wndclass2;   // Structure used to register Windows class.
   memset(&wndclass2, 0, sizeof(WNDCLASS));   // start with NULL defaults
 // Register the panel window class.
   WNDCLASS wndclass2;   // Structure used to register Windows class.
   memset(&wndclass2, 0, sizeof(WNDCLASS));   // start with NULL defaults

-  // Use CS_OWNDC to avoid messing about restoring the context
-  // for every graphic operation.
-  wndclass2.style         = CS_HREDRAW | CS_VREDRAW;
+  wndclass2.style         = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS ;

   wndclass2.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass2.cbClsExtra    = 0;
   wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4
   wndclass2.lpfnWndProc   = (WNDPROC)wxWndProc;
   wndclass2.cbClsExtra    = 0;
   wndclass2.cbWndExtra    = sizeof( DWORD ); // was 4


@@ -380,7 +378,8 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     // GNUWIN32 already fills in the first arg with the application name.
     ::GetModuleFileName(wxhInstance, name, WXSIZEOF(name));
 
     // GNUWIN32 already fills in the first arg with the application name.

-#if !defined(__GNUWIN32__)
+    // JACS: apparently not now (b20 and above?)
+#if 0 // !defined(__GNUWIN32__)

     args.Add(name);
     count ++;
 #endif
     args.Add(name);
     count ++;
 #endif


@@ -445,6 +444,15 @@ void wxApp::ConvertToStandardCommandArgs(char* lpCmdLine)
 void wxApp::CleanUp()
 {
   //// COMMON CLEANUP
 void wxApp::CleanUp()
 {
   //// COMMON CLEANUP

+
+  // flush the logged messages if any
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL && pLog->HasPendingMessages() )
+    pLog->Flush();
+
+  // One last chance for pending objects to be cleaned up
+  wxTheApp->DeletePendingObjects();
+

   wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES
   wxModule::CleanUpModules();
 
 #if wxUSE_WX_RESOURCES


@@ -608,6 +616,9 @@ int wxEntry(WXHINSTANCE hInstance,
       {
           retValue = wxTheApp->OnRun();
       }
       {
           retValue = wxTheApp->OnRun();
       }

+      else
+        // We want to initialize, but not run or exit immediately.
+        return 1;

   }
   //else: app initialization failed, so we skipped OnRun()
 
   }
   //else: app initialization failed, so we skipped OnRun()
 


@@ -630,12 +641,6 @@ int wxEntry(WXHINSTANCE hInstance,
 
   wxTheApp->OnExit();
 
 
   wxTheApp->OnExit();
 

-  // flush the logged messages if any
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->HasPendingMessages() )
-    pLog->Flush();
-
-

   wxApp::CleanUp();
 
   return retValue;
   wxApp::CleanUp();
 
   return retValue;


@@ -1121,6 +1126,11 @@ HINSTANCE wxGetInstance()
   return wxhInstance;
 }
 
   return wxhInstance;
 }
 

+void wxSetInstance(HINSTANCE hInst)
+{
+    wxhInstance = hInst;
+}
+

 // 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(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))
 // 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(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__))