X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afc515904461bec3733682252de9eb1b01af1fe4..2934005d7daecb4343b394d9faabc86c8d04dca2:/utils/configtool/src/wxconfigtool.h

diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index a88f72962a..56ec135baa 100644
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -12,7 +12,7 @@
 #ifndef _AP_WXCONFIGTOOL_H_
 #define _AP_WXCONFIGTOOL_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "wxconfigtool.cpp"
 #endif
 
@@ -43,7 +43,7 @@ public:
     ctApp();
 
     /// Destructor.
-    ~ctApp();
+    ~ctApp(){};
 
 // Accessors
 
@@ -62,13 +62,13 @@ public:
     /// Returns the notebook window.
     wxNotebook* GetNotebookWindow() { return m_notebookWindow; }
 
-    /// Returns TRUE if the application should show tooltips.
+    /// Returns true if the application should show tooltips.
     virtual bool UsingTooltips();
 
     /// Returns the help controller object for the manual.
     wxHelpControllerBase& GetHelpController() { return *m_helpController; }
 
-    /// Returns the help controller object for the wxWindows reference manual.
+    /// Returns the help controller object for the wxWidgets reference manual.
     wxHelpControllerBase& GetReferenceHelpController() { return *m_helpControllerReference; }
 
     /// Returns the document manager object.
@@ -91,7 +91,7 @@ public:
     /// Saves config info to the registry or a file.
     virtual bool SaveConfig();
 
-    /// The help controller needs to be cleared before wxWindows
+    /// The help controller needs to be cleared before wxWidgets
     /// cleanup happens.
     void ClearHelpControllers() ;
 
@@ -99,12 +99,6 @@ protected:
     /// The application directory.
     wxString                m_appDir;
 
-    /// Global print data, to remember settings during the session.
-    wxPrintData             m_printData;
-
-    /// Global page setup data.
-    wxPageSetupDialogData   m_pageSetupData;
-
     /// Notebook window.
     wxNotebook*             m_notebookWindow;