Cleaned up some comments, reorganized some code

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

diff --git a/contrib/samples/ogl/studio/doc.cpp b/contrib/samples/ogl/studio/doc.cpp
index ea8cb82eb7448f5edad78b36ceb82a259d076ef9..ea8e698b8603bc6f1f8c0bb9b062b382a6221be6 100644 (file)
--- a/contrib/samples/ogl/studio/doc.cpp
+++ b/contrib/samples/ogl/studio/doc.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -24,8 +24,6 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#include <wx/wxexpr.h>
-

 #include "studio.h"
 #include "doc.h"
 #include "view.h"
 #include "studio.h"
 #include "doc.h"
 #include "view.h"


@@ -57,18 +55,18 @@ bool csDiagramDocument::OnCloseDocument()
 
 bool csDiagramDocument::OnSaveDocument(const wxString& file)
 {
 
 bool csDiagramDocument::OnSaveDocument(const wxString& file)
 {

-  if (file == "")
+  if (file == wxEmptyString)

     return FALSE;
 
   if (!m_diagram.SaveFile(file))
   {
     wxString msgTitle;
     return FALSE;
 
   if (!m_diagram.SaveFile(file))
   {
     wxString msgTitle;

-    if (wxTheApp->GetAppName() != "")
+    if (wxTheApp->GetAppName() != wxEmptyString)

         msgTitle = wxTheApp->GetAppName();
     else
         msgTitle = wxTheApp->GetAppName();
     else

-        msgTitle = wxString("File error");
+        msgTitle = wxString(_T("File error"));

 
 

-    (void)wxMessageBox("Sorry, could not open this file for saving.", msgTitle, wxOK | wxICON_EXCLAMATION,
+    (void)wxMessageBox(_T("Sorry, could not open this file for saving."), msgTitle, wxOK | wxICON_EXCLAMATION,

       GetDocumentWindow());
     return FALSE;
   }
       GetDocumentWindow());
     return FALSE;
   }


@@ -84,15 +82,15 @@ bool csDiagramDocument::OnOpenDocument(const wxString& file)
     return FALSE;
 
   wxString msgTitle;
     return FALSE;
 
   wxString msgTitle;

-  if (wxTheApp->GetAppName() != "")
+  if (wxTheApp->GetAppName() != wxEmptyString)

     msgTitle = wxTheApp->GetAppName();
   else
     msgTitle = wxTheApp->GetAppName();
   else

-    msgTitle = wxString("File error");
+    msgTitle = wxString(_T("File error"));

 
   m_diagram.DeleteAllShapes();
   if (!m_diagram.LoadFile(file))
   {
 
   m_diagram.DeleteAllShapes();
   if (!m_diagram.LoadFile(file))
   {

-    (void)wxMessageBox("Sorry, could not open this file.", msgTitle, wxOK|wxICON_EXCLAMATION,
+    (void)wxMessageBox(_T("Sorry, could not open this file."), msgTitle, wxOK|wxICON_EXCLAMATION,

      GetDocumentWindow());
     return FALSE;
   }
      GetDocumentWindow());
     return FALSE;
   }