Code cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
index 5a7d18914abf4aa725f59bf6f94bac9e924b2808..bd6ba1712ba8360212014c6a7d3646391a10c90d 100644 (file)
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -94,7 +94,7 @@ static char * icon2_xpm[] = {
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#ifndef __WXMSW__
     #include "mondrian.xpm"
 #endif
 
@@ -186,7 +186,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     SetIcon(wxICON(mondrian));
 
     // create a menu bar
-    wxMenu *menuFile = new wxMenu(wxT(""), wxMENU_TEAROFF);
+    wxMenu *menuFile = new wxMenu(wxEmptyString, wxMENU_TEAROFF);
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;

diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
index eefb4a1a02aba0ee048a82f2dc1dacd5c33eec02..62dc84a88671c6b8d55cd8a9c7637d7951e3d4eb 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -29,8 +29,8 @@
 #include "doc.h"
 #include "view.h"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
-#include "ogl.xpm"
+#ifndef __WXMSW__
+    #include "ogl.xpm"
 #endif
 
 // A macro needed for some compilers (AIX) that need 'main' to be defined
@@ -208,4 +208,3 @@ MyFrame *GetMainFrame(void)
 {
   return wxGetApp().frame;
 }
-

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index b5b9c053b97cd29b5b255c278aece2e2ba17314a..8879747efc5b4bfade8c1fcf7577c940f87b6462 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -32,7 +32,7 @@
 #include "cspalette.h"
 #include "symbols.h"
 
-#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#ifndef __WXMSW__
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/texttool.xpm"
 #endif
@@ -118,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent)
     wxBitmap PaletteArrow(_T("arrowtool"));
     wxBitmap TextTool(_T("texttool"));
     wxSize toolBitmapSize(32, 32);
-#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
+#else // !__WXMSW__
     wxBitmap PaletteArrow(arrow_xpm);
     wxBitmap TextTool(texttool_xpm);
     wxSize toolBitmapSize(22, 22);
@@ -141,7 +141,7 @@ bool csApp::CreatePalette(wxFrame *parent)
 
   symbols[noSymbols] =  _T("Thin Rectangle");
   noSymbols ++;
- 
+
   symbols[noSymbols] =  _T("Triangle");
   noSymbols ++;
 
@@ -200,4 +200,3 @@ bool csApp::CreatePalette(wxFrame *parent)
 
   return true;
 }
-

diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index ab8347223d902047755fe9bdf82c4225ef5a7770..c6e71b6ee02edbc051afc75b0a650e708df741bb 100644 (file)
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -178,6 +178,7 @@ MyFrame::MyFrame(wxWindow *parent,
     InitToolBar(GetToolBar());
 #endif // wxUSE_TOOLBAR
 
+#if wxUSE_ACCEL
     // Accelerators
     wxAcceleratorEntry entries[3];
     entries[0].Set(wxACCEL_CTRL, (int) 'N', MDI_NEW_WINDOW);
@@ -185,6 +186,7 @@ MyFrame::MyFrame(wxWindow *parent,
     entries[2].Set(wxACCEL_CTRL, (int) 'A', MDI_ABOUT);
     wxAcceleratorTable accel(3, entries);
     SetAcceleratorTable(accel);
+#endif // wxUSE_ACCEL
 }
 
 void MyFrame::OnClose(wxCloseEvent& event)
@@ -280,7 +282,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& WXUNUSED(event) )
     subframe->Show(true);
 }
 
-void MyFrame::OnSize(wxSizeEvent& 
+void MyFrame::OnSize(wxSizeEvent&
                                   #ifdef __WXUNIVERSAL__
                                   event
                                   #else
@@ -297,7 +299,7 @@ void MyFrame::OnSize(wxSizeEvent&
     // FIXME: On wxX11, we need the MDI frame to process this
     // event, but on other platforms this should not
     // be done.
-#ifdef __WXUNIVERSAL__   
+#ifdef __WXUNIVERSAL__
     event.Skip();
 #endif
 }
@@ -519,5 +521,3 @@ void MyChild::OnClose(wxCloseEvent& event)
 
     event.Skip();
 }
-
-

diff --git a/utils/configtool/src/configtooldoc.cpp b/utils/configtool/src/configtooldoc.cpp
index f306284f13ffbbc53103bf0bbaee6d143cc57630..ff3308f98c3a0e94973f254ae276ecab45a0c24e 100644 (file)
--- a/utils/configtool/src/configtooldoc.cpp
+++ b/utils/configtool/src/configtooldoc.cpp
@@ -101,7 +101,7 @@ bool ctConfigToolDoc::Save()
 {
     if (!IsModified() && m_savedYet) return true;
 
-    bool ret = (m_documentFile == wxT("") || !m_savedYet) ?
+    bool ret = (m_documentFile.empty() || !m_savedYet) ?
                  SaveAs() :
                  OnSaveDocument(m_documentFile);
     if ( ret )
@@ -124,9 +124,9 @@ bool ctConfigToolDoc::OnCreate(const wxString& path, long flags)
         //rootItem->InitProperties();
         rootItem->GetProperties().AddProperty(
         new ctProperty(
-        wxT("The item description."),
-        wxVariant(wxT(""), wxT("description")),
-        wxT("multiline")));
+            wxT("The item description."),
+            wxVariant(wxEmptyString, wxT("description")),
+            wxT("multiline")));
 
         rootItem->SetPropertyString(_T("description"),
             _T("<B>This is the top-level configuration item.</B>"));
@@ -501,7 +501,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             wxString type(wxT("string"));
                             wxString choices;
                             wxString editorType(wxT("string"));
-                            wxString description(wxT(""));
+                            wxString description;
                             childTag->GetAttributeValue(type, wxT("type"));
                             childTag->GetAttributeValue(type, wxT("editor-type"));
                             childTag->GetAttributeValue(type, wxT("choices"));
@@ -514,7 +514,7 @@ bool ctConfigToolDoc::DoOpen(wxSimpleHtmlTag* tag, ctConfigItem* parent)
                             else if (type == wxT("long"))
                                 prop->GetVariant() = wxVariant((long) 0, name);
                             else
-                                prop->GetVariant() = wxVariant(wxT(""), name);
+                                prop->GetVariant() = wxVariant(wxEmptyString, name);
                             prop->SetDescription(description);
                             prop->SetCustom(true);
                             prop->SetEditorType(editorType);
@@ -797,6 +797,8 @@ wxString ctConfigToolDoc::GetFrameworkDir(bool makeUnix)
 #ifdef __WXMSW__
         if (makeUnix)
             path.Replace(wxT("\\"), wxT("/"));
+#else
+        wxUnusedVar(makeUnix);
 #endif
     }
     return path;