Changes to allow Cygwin to compile in non-PCH mode

[wxWidgets.git] / src / common / docview.cpp

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 0495f862db47984f734641c1a9c0b57a71e603ae..26281bef2704e43633e926d9eb2bc5f929e0dc47 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -1044,7 +1044,7 @@ void wxDocManager::FileHistoryRemoveMenu(wxMenu *menu)
     m_fileHistory->RemoveMenu(menu);
 }
 
-#ifdef wxUSE_CONFIG
+#if wxUSE_CONFIG
 void wxDocManager::FileHistoryLoad(wxConfigBase& config)
 {
   if (m_fileHistory)
@@ -1258,7 +1258,7 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
   int n = 0;
   for (i = 0; i < noTemplates; i++)
   {
-    if (templates[i]->IsVisible() && templates[i]->GetViewName())
+    if (templates[i]->IsVisible() && (templates[i]->GetViewName() != ""))
     {
       strings[n] = WXSTRINGCAST templates[i]->m_viewTypeName;
       data[n] = (char *)templates[i];
@@ -1706,7 +1706,7 @@ void wxCommandProcessor::SetMenuStrings(void)
         // we've undone to the start of the list, but can redo the first.
         wxCommand *redoCommand = (wxCommand *)m_commands.First()->Data();
         wxString redoCommandName(redoCommand->GetName());
-        if (!redoCommandName) redoCommandName = _("Unnamed command");
+        if (redoCommandName == "") redoCommandName = _("Unnamed command");
         buf = wxString(_("&Redo ")) + redoCommandName;
         m_commandEditMenu->SetLabel(wxID_REDO, buf);
         m_commandEditMenu->Enable(wxID_REDO, TRUE);
@@ -1822,7 +1822,7 @@ void wxFileHistory::RemoveMenu(wxMenu *menu)
   m_fileMenus.DeleteObject(menu);
 }
 
-#ifdef wxUSE_CONFIG
+#if wxUSE_CONFIG
 void wxFileHistory::Load(wxConfigBase& config)
 {
   m_fileHistoryN = 0;