Corrected InsertColumnItem name

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

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index 9057369d050a3dee8df58e9b6e0e401689aa1b69..cf240a0dca28c3399a30eb20fafb2e107a08f167 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -12,12 +12,15 @@
 #ifndef _AP_MAINFRAME_H_
 #define _AP_MAINFRAME_H_
 
 #ifndef _AP_MAINFRAME_H_
 #define _AP_MAINFRAME_H_
 

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

 #pragma interface "mainframe.cpp"
 #endif
 
 #include "wx/imaglist.h"
 #include "wx/docview.h"
 #pragma interface "mainframe.cpp"
 #endif
 
 #include "wx/imaglist.h"
 #include "wx/docview.h"

+#include "wx/notebook.h"
+
+// #define USE_CONFIG_BROWSER_PAGE

 
 class WXDLLEXPORT wxHtmlWindow;
 class WXDLLEXPORT wxSplitterWindow;
 
 class WXDLLEXPORT wxHtmlWindow;
 class WXDLLEXPORT wxSplitterWindow;


@@ -27,6 +30,9 @@ class ctConfigTreeCtrl;
 class ctPropertyEditor;
 class ctOutputWindow;
 class ctFindReplaceDialog;
 class ctPropertyEditor;
 class ctOutputWindow;
 class ctFindReplaceDialog;

+#ifdef USE_CONFIG_BROWSER_PAGE
+class ctConfigurationBrowserWindow;
+#endif

 
 /*!
  * \brief The main window of the application.
 
 /*!
  * \brief The main window of the application.


@@ -35,7 +41,7 @@ class ctFindReplaceDialog;
 class ctMainFrame: public wxDocParentFrame
 {
     DECLARE_CLASS(ctMainFrame)
 class ctMainFrame: public wxDocParentFrame
 {
     DECLARE_CLASS(ctMainFrame)

-  public:
+public:

     /// Constructor.
     ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
 
     /// Constructor.
     ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style);
 


@@ -118,7 +124,7 @@ class ctMainFrame: public wxDocParentFrame
     /// Returns the configure page window
     ctOutputWindow* GetConfigurePage() const { return m_configurePage; }
 
     /// Returns the configure page window
     ctOutputWindow* GetConfigurePage() const { return m_configurePage; }
 

-    /// Returns the main notebook containing editor and text tabs 
+    /// Returns the main notebook containing editor and text tabs

     wxNotebook* GetMainNotebook() const { return m_mainNotebook; }
 
     /// Sets the find dialog for future closing
     wxNotebook* GetMainNotebook() const { return m_mainNotebook; }
 
     /// Sets the find dialog for future closing


@@ -153,6 +159,12 @@ protected:
     ctOutputWindow*         m_setupPage;
     ctOutputWindow*         m_configurePage;
 
     ctOutputWindow*         m_setupPage;
     ctOutputWindow*         m_configurePage;
 

+    // The control panel for browsing, adding and removing
+    // configurations.
+#ifdef USE_CONFIG_BROWSER_PAGE
+    ctConfigurationBrowserWindow*   m_configBrowserPage;
+#endif
+

     ctFindReplaceDialog*    m_findDialog;
 };
 
     ctFindReplaceDialog*    m_findDialog;
 };
 


@@ -166,7 +178,7 @@ DECLARE_CLASS(ctOutputWindow)
 public:
     ctOutputWindow(wxWindow* parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
 public:
     ctOutputWindow(wxWindow* parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);

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

 
     /// Initialise the windows.
     void CreateWindows();
 
     /// Initialise the windows.
     void CreateWindows();