Starting to update the tarball and rpm spec files for 2.5. Mostly

[wxWidgets.git] / contrib / samples / ogl / studio / project.cpp

diff --git a/contrib/samples/ogl/studio/project.cpp b/contrib/samples/ogl/studio/project.cpp
index a6298d698ef2a5c6cc15e90625502cbb806839ff..982e2393937c1f6b5899dd2d21e819ca419016cc 100644 (file)
--- a/contrib/samples/ogl/studio/project.cpp
+++ b/contrib/samples/ogl/studio/project.cpp
@@ -31,14 +31,14 @@ BEGIN_EVENT_TABLE(csProjectTreeCtrl, wxTreeCtrl)
 END_EVENT_TABLE()
 
 // Define my frame constructor
 END_EVENT_TABLE()
 
 // Define my frame constructor

-csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
+csProjectTreeCtrl::csProjectTreeCtrl(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,

        long style):
 
   wxTreeCtrl(parent, id, pos, size, style),
   m_imageList(16, 16)
 {
        long style):
 
   wxTreeCtrl(parent, id, pos, size, style),
   m_imageList(16, 16)
 {

-    m_imageList.Add(wxIcon("folder1"));
-    m_imageList.Add(wxIcon("file1"));
+    m_imageList.Add(wxIcon(_T("folder1")));
+    m_imageList.Add(wxIcon(_T("file1")));

 
     SetImageList(& m_imageList);
 }
 
     SetImageList(& m_imageList);
 }


@@ -49,7 +49,7 @@ csProjectTreeCtrl::~csProjectTreeCtrl()
 }
 
 // Create the project window
 }
 
 // Create the project window

-bool csApp::CreateProjectWindow(wxFrame *parent)
+bool csApp::CreateProjectWindow(wxFrame *WXUNUSED(parent))

 {
 #if 0
     // Create a layout window
 {
 #if 0
     // Create a layout window


@@ -57,7 +57,7 @@ bool csApp::CreateProjectWindow(wxFrame *parent)
     win->SetDefaultSize(wxSize(150, 10000));
     win->SetOrientation(wxLAYOUT_VERTICAL);
     win->SetAlignment(wxLAYOUT_LEFT);
     win->SetDefaultSize(wxSize(150, 10000));
     win->SetOrientation(wxLAYOUT_VERTICAL);
     win->SetAlignment(wxLAYOUT_LEFT);

-    win->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+    win->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));

     win->SetSashVisible(wxSASH_RIGHT, TRUE);
     win->SetExtraBorderSize(5);
 
     win->SetSashVisible(wxSASH_RIGHT, TRUE);
     win->SetExtraBorderSize(5);