Don't overwrite status message when restoring it if it changed.

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

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index 8a32c9f7084ebef85f08d32e309a8efc000e4600..2295b2665c3ab56ac15d7ef2215caa57261d0c05 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        penwin.cpp
+// Name:        src/msw/penwin.cpp

 // Purpose:     PenWindows code
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     PenWindows code
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

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


@@ -21,8 +17,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/setup.h"
-#include "wx/window.h"
+    #include "wx/window.h"

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


@@ -62,7 +57,7 @@ void wxEnablePenAppHooks (bool hook)
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, register this app so all
       // EDIT controls in dialogs are replaced by HEDIT controls.
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, register this app so all
       // EDIT controls in dialogs are replaced by HEDIT controls.

-      if ((g_hPenWin = (HANDLE)GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL)
+      if ((g_hPenWin = (HANDLE)::GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL)

       {
         // We do this fancy GetProcAddress simply because we don't
         // know if we're running Pen Windows.
       {
         // We do this fancy GetProcAddress simply because we don't
         // know if we're running Pen Windows.


@@ -97,7 +92,7 @@ void wxRegisterPenWin(void)
 // (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.
 // (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.

-  if ((g_hPenWin = (HANDLE)GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) {
+  if ((g_hPenWin = (HANDLE)::GetSystemMetrics(SM_PENWINDOWS)) != (HANDLE)NULL) {

     // We do this fancy GetProcAddress simply because we don't
     // know if we're running Pen Windows.
    if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(g_hPenWin, "RegisterPenApp"))!= NULL)
     // We do this fancy GetProcAddress simply because we don't
     // know if we're running Pen Windows.
    if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(g_hPenWin, "RegisterPenApp"))!= NULL)


@@ -117,4 +112,3 @@ void wxCleanUpPenWin(void)
   }
 #endif
 }
   }
 #endif
 }

-