Don't access null tip_window pointer [ 1767485 ] wxGtk uses private API, breaks with...

[wxWidgets.git] / demos / poem / wxpoem.cpp

diff --git a/demos/poem/wxpoem.cpp b/demos/poem/wxpoem.cpp
index 0b05f793cca439e2c87c4d75f00ade5daaca8892..13da0411e9c92d428e75c6aba8da84d8daa77de4 100644 (file)
--- a/demos/poem/wxpoem.cpp
+++ b/demos/poem/wxpoem.cpp
@@ -14,10 +14,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "wxpoem.h"
-#endif
-

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


@@ -183,8 +179,8 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
     // See what ACTUAL char height is
     if(m_normalFont)
         dc->SetFont(*m_normalFont);
     // See what ACTUAL char height is
     if(m_normalFont)
         dc->SetFont(*m_normalFont);

-    long xx;
-    long yy;
+    wxCoord xx;
+    wxCoord yy;

     dc->GetTextExtent(_T("X"), &xx, &yy);
     char_height = (int)yy;
 
     dc->GetTextExtent(_T("X"), &xx, &yy);
     char_height = (int)yy;
 


@@ -486,7 +482,7 @@ void MainWindow::Search(bool ask)
     if (ask || m_searchString.empty())
     {
         wxString s = wxGetTextFromUser( _T("Enter search string"), _T("Search"), m_searchString);
     if (ask || m_searchString.empty())
     {
         wxString s = wxGetTextFromUser( _T("Enter search string"), _T("Search"), m_searchString);

-        if (s != wxEmptyString)
+        if (!s.empty())

         {
             s.MakeLower();
             m_searchString = s;
         {
             s.MakeLower();
             m_searchString = s;


@@ -755,11 +751,13 @@ int GetIndex()
 // Read preferences
 void MainWindow::ReadPreferences()
 {
 // Read preferences
 void MainWindow::ReadPreferences()
 {

+/* TODO: convert this code to use wxConfig

 #if wxUSE_RESOURCES
     wxGetResource(_T("wxPoem"), _T("FontSize"), &pointSize);
     wxGetResource(_T("wxPoem"), _T("X"), &XPos);
     wxGetResource(_T("wxPoem"), _T("Y"), &YPos);
 #endif
 #if wxUSE_RESOURCES
     wxGetResource(_T("wxPoem"), _T("FontSize"), &pointSize);
     wxGetResource(_T("wxPoem"), _T("X"), &XPos);
     wxGetResource(_T("wxPoem"), _T("Y"), &YPos);
 #endif

+*/

 }
 
 // Write preferences to disk
 }
 
 // Write preferences to disk


@@ -767,11 +765,13 @@ void MainWindow::WritePreferences()
 {
 #ifdef __WXMSW__
     TheMainWindow->GetPosition(&XPos, &YPos);
 {
 #ifdef __WXMSW__
     TheMainWindow->GetPosition(&XPos, &YPos);

+/* TODO: convert this code to use wxConfig

 #if wxUSE_RESOURCES
     wxWriteResource(_T("wxPoem"), _T("FontSize"), pointSize);
     wxWriteResource(_T("wxPoem"), _T("X"), XPos);
     wxWriteResource(_T("wxPoem"), _T("Y"), YPos);
 #endif
 #if wxUSE_RESOURCES
     wxWriteResource(_T("wxPoem"), _T("FontSize"), pointSize);
     wxWriteResource(_T("wxPoem"), _T("X"), XPos);
     wxWriteResource(_T("wxPoem"), _T("Y"), YPos);
 #endif

+*/

 #endif
 }
 
 #endif
 }
 


@@ -888,7 +888,7 @@ long MainWindow::DoSearch(void)
 
         // Only match if we're looking at a different poem
         // (no point in displaying the same poem again)
 
         // Only match if we're looking at a different poem
         // (no point in displaying the same poem again)

-        if ((ch == m_searchString[i]) && (last_poem_start != previous_poem_start))
+        if ((m_searchString[i] == ch) && (last_poem_start != previous_poem_start))

         {
             if (i == 0)
                 last_find = ftell(file);
         {
             if (i == 0)
                 last_find = ftell(file);