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 db4e427e9f2f2920f89987caf73b63eee1d8d9f2..afb20dc16f5e340a08ea8b265fd61a4a08e0c2cc 100644 (file)
--- a/src/msw/penwin.cpp
+++ b/src/msw/penwin.cpp
@@ -5,29 +5,29 @@
 // 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".
-#define IN_WX_MAIN_CPP
 #include "wx/wxprec.h"
 
-#if defined(__BORLANDC__)
+#ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #include "wx/setup.h"
+#include "wx/window.h"
 #endif
 
 #include "wx/msw/private.h"
 
-#if USE_PENWINDOWS
+#if wxUSE_PENWINDOWS
 
 #ifdef __BORLANDC__
 #define RPA_DEFAULT 1
@@ -86,11 +86,11 @@ void wxEnablePenAppHooks (bool hook)
 }
 
 #endif
-  // End USE_PENWINDOWS
+  // End wxUSE_PENWINDOWS
 
 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.
@@ -109,7 +109,7 @@ void wxRegisterPenWin(void)
 
 void wxCleanUpPenWin(void)
 {
-#if USE_PENWINDOWS
+#if wxUSE_PENWINDOWS
   if (g_hPenWin) {
     // Unregister this app
     if (RegPenApp != NULL)