added carbonaccessors.o

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

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index 6fca0c5cdacf90511fea7941a087a32a9d9c0726..3545a28bda121ec4711dc05465e3f37e254c9879 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -14,20 +14,20 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#define IN_WX_MAIN_CPP

 #include "wx/wxprec.h"
 
 #include "wx/wxprec.h"
 

-#if defined(__BORLANDC__)
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"

+#include "wx/window.h"

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

-#if USE_PENWINDOWS
+#if wxUSE_PENWINDOWS

 
 #ifdef __BORLANDC__
 #define RPA_DEFAULT 1
 
 #ifdef __BORLANDC__
 #define RPA_DEFAULT 1


@@ -35,7 +35,7 @@
 #include <penwin.h>
 #endif
 
 #include <penwin.h>
 #endif
 

-HANDLE s_hPenWin = (HANDLE)NULL;
+HANDLE g_hPenWin = (HANDLE)NULL;

 typedef void (CALLBACK * PENREGPROC)(WORD,BOOL);
 
 // The routine below allows Windows applications (binaries) to
 typedef void (CALLBACK * PENREGPROC)(WORD,BOOL);
 
 // The routine below allows Windows applications (binaries) to


@@ -56,17 +56,17 @@ void wxEnablePenAppHooks (bool hook)
 #ifndef __WIN32__
   if (hook)
     {
 #ifndef __WIN32__
   if (hook)
     {

-      if (s_hPenWin)
+      if (g_hPenWin)

        return;
 
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, register this app so all
       // EDIT controls in dialogs are replaced by HEDIT controls.
        return;
 
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, register this app so all
       // EDIT controls in dialogs are replaced by HEDIT controls.

-      if ((s_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.

-         if ((RegPenApp = (PENREGPROC)GetProcAddress (s_hPenWin, "RegisterPenApp")) != NULL)
+         if ((RegPenApp = (PENREGPROC)GetProcAddress (g_hPenWin, "RegisterPenApp")) != NULL)

            (*RegPenApp) (RPA_DEFAULT, TRUE);
        }
     }
            (*RegPenApp) (RPA_DEFAULT, TRUE);
        }
     }


@@ -74,33 +74,33 @@ void wxEnablePenAppHooks (bool hook)
     {
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, unregister
     {
       ///////////////////////////////////////////////////////////////////////
       // If running on a Pen Windows system, unregister

-      if (s_hPenWin)
+      if (g_hPenWin)

        {
          // Unregister this app 
          if (RegPenApp != NULL)
            (*RegPenApp) (RPA_DEFAULT, FALSE);
        {
          // Unregister this app 
          if (RegPenApp != NULL)
            (*RegPenApp) (RPA_DEFAULT, FALSE);

-         s_hPenWin = (HANDLE) NULL;
+         g_hPenWin = (HANDLE) NULL;

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

-  // End USE_PENWINDOWS
+  // End wxUSE_PENWINDOWS

 
 void wxRegisterPenWin(void)
 {
 
 void wxRegisterPenWin(void)
 {

-#if USE_PENWINDOWS
+#if wxUSE_PENWINDOWS

 ///////////////////////////////////////////////////////////////////////
 // If running on a Pen Windows system, register this app so all
 // EDIT controls in dialogs are replaced by HEDIT controls.
 // (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.
 ///////////////////////////////////////////////////////////////////////
 // If running on a Pen Windows system, register this app so all
 // EDIT controls in dialogs are replaced by HEDIT controls.
 // (Notice the CONTROL statement in the RC file is "EDIT",
 // RegisterPenApp will automatically change that control to
 // an HEDIT.

-  if ((s_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.

-   if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(s_hPenWin, "RegisterPenApp"))!= NULL)
+   if ( (RegPenApp = (void (CALLBACK *)(WORD, BOOL))GetProcAddress(g_hPenWin, "RegisterPenApp"))!= NULL)

      (*RegPenApp)(RPA_DEFAULT, TRUE);
   }
 ///////////////////////////////////////////////////////////////////////
      (*RegPenApp)(RPA_DEFAULT, TRUE);
   }
 ///////////////////////////////////////////////////////////////////////


@@ -109,9 +109,9 @@ void wxRegisterPenWin(void)
 
 void wxCleanUpPenWin(void)
 {
 
 void wxCleanUpPenWin(void)
 {

-#if USE_PENWINDOWS
-  if (s_hPenWin) {
-    // Unregister this app 
+#if wxUSE_PENWINDOWS
+  if (g_hPenWin) {
+    // Unregister this app

     if (RegPenApp != NULL)
        (*RegPenApp)(RPA_DEFAULT, FALSE);
   }
     if (RegPenApp != NULL)
        (*RegPenApp)(RPA_DEFAULT, FALSE);
   }