Added window styles to wxToolBar handler.

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

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 8bf876bf69bbda9ac8db5a340e8b67123ade7c26..ff22400c8207db01eba753240f5db4768db32ac4 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -9,7 +9,7 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "mainframe.h"
 #endif
 
@@ -98,7 +98,9 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
     m_editMenu = NULL;
     m_configurePage = NULL;
     m_setupPage = NULL;
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_configBrowserPage = NULL;
+#endif
     m_mainNotebook = NULL;
     m_findDialog = NULL;
 
@@ -118,13 +120,13 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
     m_configurePage = new ctOutputWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200),
         wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
 
-#if 0
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_configBrowserPage = new ctConfigurationBrowserWindow(m_mainNotebook, -1, wxDefaultPosition, wxSize(300, 200),
         wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
 #endif
 
     m_mainNotebook->AddPage(m_propertyEditor, _T("Properties"));
-#if 0
+#ifdef USE_CONFIG_BROWSER_PAGE
     m_mainNotebook->AddPage(m_configBrowserPage, _T("Configuration Browser"));
 #endif
     m_mainNotebook->AddPage(m_setupPage, _T("setup.h"));