wxCocoa build fix.

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

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index d6ea7c4a748c3b93c416b4d633f7a84640380bac..49b379920986342e521b8d40a2f578a6b794a469 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -18,6 +18,10 @@
 
 #include "wx/imaglist.h"
 #include "wx/docview.h"
+#include "wx/notebook.h"
+#include "wx/textctrl.h"
+
+// #define USE_CONFIG_BROWSER_PAGE
 
 class WXDLLEXPORT wxHtmlWindow;
 class WXDLLEXPORT wxSplitterWindow;
@@ -27,7 +31,9 @@ class ctConfigTreeCtrl;
 class ctPropertyEditor;
 class ctOutputWindow;
 class ctFindReplaceDialog;
+#ifdef USE_CONFIG_BROWSER_PAGE
 class ctConfigurationBrowserWindow;
+#endif
 
 /*!
  * \brief The main window of the application.
@@ -36,7 +42,7 @@ class ctConfigurationBrowserWindow;
 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);
 
@@ -119,7 +125,7 @@ class ctMainFrame: public wxDocParentFrame
     /// 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
@@ -156,7 +162,9 @@ protected:
 
     // The control panel for browsing, adding and removing
     // configurations.
+#ifdef USE_CONFIG_BROWSER_PAGE
     ctConfigurationBrowserWindow*   m_configBrowserPage;
+#endif
 
     ctFindReplaceDialog*    m_findDialog;
 };
@@ -171,13 +179,15 @@ DECLARE_CLASS(ctOutputWindow)
 public:
     ctOutputWindow(wxWindow* parent, wxWindowID id,
         const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
-    ~ctOutputWindow();
+    ~ctOutputWindow(){};
 
     /// Initialise the windows.
     void CreateWindows();
 
     /// Copies the text to the clipboard.
+#if wxUSE_CLIPBOARD
     void OnCopyToClipboard(wxCommandEvent& event);
+#endif // wxUSE_CLIPBOARD
     void OnUpdateCopy(wxUpdateUIEvent& event);
 
     /// Regenerates setup.h/configure command