Warning fix.

[wxWidgets.git] / utils / configtool / src / wxconfigtool.h

diff --git a/utils/configtool/src/wxconfigtool.h b/utils/configtool/src/wxconfigtool.h
index 72ed69e763f5ac97224cbb999de9864bee538bdd..4a1e57fce9d4eab2ebd1f46799f77539d712a57a 100644 (file)
--- a/utils/configtool/src/wxconfigtool.h
+++ b/utils/configtool/src/wxconfigtool.h
@@ -12,12 +12,13 @@
 #ifndef _AP_WXCONFIGTOOL_H_
 #define _AP_WXCONFIGTOOL_H_
 
 #ifndef _AP_WXCONFIGTOOL_H_
 #define _AP_WXCONFIGTOOL_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "wxconfigtool.cpp"
 #endif
 
 #include "wx/docview.h"
 #include "wx/help.h"
 #pragma interface "wxconfigtool.cpp"
 #endif
 
 #include "wx/docview.h"
 #include "wx/help.h"

+#include "wx/app.h"

 
 #ifdef __WXMSW__
 #include "wx/msw/helpchm.h"
 
 #ifdef __WXMSW__
 #include "wx/msw/helpchm.h"


@@ -43,7 +44,7 @@ public:
     ctApp();
 
     /// Destructor.
     ctApp();
 
     /// Destructor.

-    ~ctApp();
+    ~ctApp(){};

 
 // Accessors
 
 
 // Accessors
 


@@ -62,13 +63,13 @@ public:
     /// Returns the notebook window.
     wxNotebook* GetNotebookWindow() { return m_notebookWindow; }
 
     /// 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; }
 
     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.
     wxHelpControllerBase& GetReferenceHelpController() { return *m_helpControllerReference; }
 
     /// Returns the document manager object.


@@ -91,7 +92,7 @@ public:
     /// Saves config info to the registry or a file.
     virtual bool SaveConfig();
 
     /// 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() ;
 
     /// cleanup happens.
     void ClearHelpControllers() ;
 


@@ -99,12 +100,6 @@ protected:
     /// The application directory.
     wxString                m_appDir;
 
     /// 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;
 
     /// Notebook window.
     wxNotebook*             m_notebookWindow;
 


@@ -136,6 +131,7 @@ DECLARE_APP(ctApp)
 // File menu ids
 #define ctID_SAVE_SETUP_FILE                1001
 #define ctID_SAVE_CONFIGURE_COMMAND         1002
 // File menu ids
 #define ctID_SAVE_SETUP_FILE                1001
 #define ctID_SAVE_CONFIGURE_COMMAND         1002

+#define ctID_GO                             1003

 
 // Edit menu ids
 #define ctID_ADD_ITEM                       1030
 
 // Edit menu ids
 #define ctID_ADD_ITEM                       1030