Small fixes to allow compilation in Unicode mode with gcc

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

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 43247a405cb24aeca080c13d632d306799401611..31965e216474a25f911ed35414dda006dc9d3b70 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -9,10 +9,6 @@
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "mainframe.h"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -110,7 +106,7 @@ ctMainFrame::ctMainFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id,
     m_findDialog = NULL;
 
     m_treeSplitterWindow = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(400, 300),
     m_findDialog = NULL;
 
     m_treeSplitterWindow = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxSize(400, 300),

-        wxSP_3DSASH|wxSP_3DBORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
+        wxSP_3DSASH|wxSP_3DBORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN|wxSP_NO_XP_THEME);

 
     m_configTreeCtrl = new ctConfigTreeCtrl(m_treeSplitterWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize,
         wxTR_HAS_BUTTONS|wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);
 
     m_configTreeCtrl = new ctConfigTreeCtrl(m_treeSplitterWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize,
         wxTR_HAS_BUTTONS|wxNO_BORDER|wxNO_FULL_REPAINT_ON_RESIZE|wxCLIP_CHILDREN);


@@ -421,7 +417,9 @@ void ctMainFrame::OnUpdateDisable(wxUpdateUIEvent& event)
 IMPLEMENT_CLASS(ctOutputWindow, wxPanel)
 
 BEGIN_EVENT_TABLE(ctOutputWindow, wxPanel)
 IMPLEMENT_CLASS(ctOutputWindow, wxPanel)
 
 BEGIN_EVENT_TABLE(ctOutputWindow, wxPanel)

+#if wxUSE_CLIPBOARD

     EVT_BUTTON(wxID_COPY, ctOutputWindow::OnCopyToClipboard)
     EVT_BUTTON(wxID_COPY, ctOutputWindow::OnCopyToClipboard)

+#endif // wxUSE_CLIPBOARD

     EVT_BUTTON(wxID_SAVE, ctOutputWindow::OnSaveText)
     EVT_BUTTON(ctID_REGENERATE, ctOutputWindow::OnRegenerate)
     EVT_UPDATE_UI(wxID_SAVE, ctOutputWindow::OnUpdateSaveText)
     EVT_BUTTON(wxID_SAVE, ctOutputWindow::OnSaveText)
     EVT_BUTTON(ctID_REGENERATE, ctOutputWindow::OnRegenerate)
     EVT_UPDATE_UI(wxID_SAVE, ctOutputWindow::OnUpdateSaveText)


@@ -471,6 +469,7 @@ void ctOutputWindow::CreateWindows()
     SetSizer( item0 );
 }
 
     SetSizer( item0 );
 }
 

+#if wxUSE_CLIPBOARD

 /// Copies the text to the clipboard.
 void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
 {
 /// Copies the text to the clipboard.
 void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
 {


@@ -506,6 +505,7 @@ void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
         wxTheClipboard->Close();
     }
 }
         wxTheClipboard->Close();
     }
 }

+#endif // wxUSE_CLIPBOARD

 
 /// Sets the code in the text control.
 void ctOutputWindow::SetText(const wxString& text)
 
 /// Sets the code in the text control.
 void ctOutputWindow::SetText(const wxString& text)