Fixed test for button style - styles contain other style bits

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

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index 3545a28bda121ec4711dc05465e3f37e254c9879..ec3a6fccbb28c8fc66bbed2ad6882b385339d10f 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -5,11 +5,11 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -42,7 +42,7 @@ typedef void (CALLBACK * PENREGPROC)(WORD,BOOL);
 // support Pen input when running under Microsoft Windows for
 // Pen Computing 1.0 without need of the PenPalete.
 //
 // support Pen input when running under Microsoft Windows for
 // Pen Computing 1.0 without need of the PenPalete.
 //

-// Should masked edit functions be added to wxWindows we would
+// Should masked edit functions be added to wxWidgets we would

 // be a new class of functions to support BEDIT controls.
 //
 // (The function is a NOOP for native Windows-NT)
 // be a new class of functions to support BEDIT controls.
 //
 // (The function is a NOOP for native Windows-NT)


@@ -57,32 +57,32 @@ void wxEnablePenAppHooks (bool hook)
   if (hook)
     {
       if (g_hPenWin)
   if (hook)
     {
       if (g_hPenWin)

-       return;
+      return;

 
       ///////////////////////////////////////////////////////////////////////
       // 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)
-       {
-         // We do this fancy GetProcAddress simply because we don't
-         // know if we're running Pen Windows.
-         if ((RegPenApp = (PENREGPROC)GetProcAddress (g_hPenWin, "RegisterPenApp")) != NULL)
-           (*RegPenApp) (RPA_DEFAULT, TRUE);
-       }
+      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 = (PENREGPROC)GetProcAddress (g_hPenWin, "RegisterPenApp")) != NULL)
+          (*RegPenApp) (RPA_DEFAULT, TRUE);
+      }

     }
   else
     {
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, unregister
       if (g_hPenWin)
     }
   else
     {
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, unregister
       if (g_hPenWin)

-       {
-         // Unregister this app 
-         if (RegPenApp != NULL)
-           (*RegPenApp) (RPA_DEFAULT, FALSE);
-         g_hPenWin = (HANDLE) NULL;
-       }
+      {
+        // Unregister this app
+        if (RegPenApp != NULL)
+          (*RegPenApp) (RPA_DEFAULT, FALSE);
+        g_hPenWin = (HANDLE) NULL;
+      }

     }
     }

-#endif /* ! Windows-NT */
+#endif /* ! Windows-NT */

 }
 
 #endif
 }
 
 #endif


@@ -97,7 +97,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)


@@ -113,7 +113,7 @@ void wxCleanUpPenWin(void)
   if (g_hPenWin) {
     // Unregister this app
     if (RegPenApp != NULL)
   if (g_hPenWin) {
     // Unregister this app
     if (RegPenApp != NULL)

-       (*RegPenApp)(RPA_DEFAULT, FALSE);
+      (*RegPenApp)(RPA_DEFAULT, FALSE);

   }
 #endif
 }
   }
 #endif
 }