xti additions / changes, trying to reduce dependencies

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

diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp
index 4ec5935e6ea04f480726e7ca66cd401a50c655c9..afb20dc16f5e340a08ea8b265fd61a4a08e0c2cc 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -5,28 +5,29 @@
 // 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
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #pragma implementation
 #endif
 
 // For compilers that support precompilation, includes "wx.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


@@ -85,11 +86,11 @@ void wxEnablePenAppHooks (bool hook)
 }
 
 #endif
 }
 
 #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.
 ///////////////////////////////////////////////////////////////////////
 // If running on a Pen Windows system, register this app so all
 // EDIT controls in dialogs are replaced by HEDIT controls.


@@ -108,7 +109,7 @@ void wxRegisterPenWin(void)
 
 void wxCleanUpPenWin(void)
 {
 
 void wxCleanUpPenWin(void)
 {

-#if USE_PENWINDOWS
+#if wxUSE_PENWINDOWS

   if (g_hPenWin) {
     // Unregister this app
     if (RegPenApp != NULL)
   if (g_hPenWin) {
     // Unregister this app
     if (RegPenApp != NULL)