Revert Cygwin changes

[wxWidgets.git] / include / wx / msw / apptbase.h

diff --git a/include/wx/msw/apptbase.h b/include/wx/msw/apptbase.h
index a080eea7b77c139b43b043b320d44be5cdf9a9e3..6105eca8eecfac8cfdc6e1f11ed0b86c8f294b8c 100644 (file)
--- a/include/wx/msw/apptbase.h
+++ b/include/wx/msw/apptbase.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     22.06.2003
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     22.06.2003
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -16,7 +16,7 @@
 // wxAppTraits: the MSW version adds extra hooks needed by MSW-only code
 // ----------------------------------------------------------------------------
 
 // wxAppTraits: the MSW version adds extra hooks needed by MSW-only code
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxAppTraits : public wxAppTraitsBase
+class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase

 {
 public:
     // wxExecute() support methods
 {
 public:
     // wxExecute() support methods


@@ -40,6 +40,14 @@ public:
     // process a message while waiting for a(nother) thread, should return
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;
     // process a message while waiting for a(nother) thread, should return
     // false if and only if we have to exit the application
     virtual bool DoMessageFromThreadWait() = 0;

+
+    // other miscellaneous helpers
+    // ---------------------------
+
+    // under MSW this function returns same version for both console and GUI
+    // applications so we can implement it directly in the base class and only
+    // override it wxGUIAppTraits to fill in toolkit information
+    virtual wxToolkitInfo& GetToolkitInfo();

 };
 
 #endif // _WX_MSW_APPTBASE_H_
 };
 
 #endif // _WX_MSW_APPTBASE_H_