X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69da0d99464a82aae30dcb704c98bc9b4e7b095b..ace1785b153d4873a7c7684047c144facd11a26d:/utils/configtool/src/mainframe.cpp diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp index 8bf876bf69..ff22400c82 100644 --- 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"));