add comparison operators for UUID class (#9871)

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 6437b543c32b3cfc88fe1a7adb4a388fa53e5d2a..3ef8f9a1f9e6493f1d89623aad7d0e02d5e367db 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -25,6 +25,7 @@
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dataobj.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
     #include "wx/dataobj.h"

+    #include "wx/statusbr.h"

 #endif
 
 #include "wx/html/htmlwin.h"
 #endif
 
 #include "wx/html/htmlwin.h"


@@ -291,7 +292,8 @@ void wxHtmlWindow::Init()
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
 #if wxUSE_STATUSBAR
     m_tmpCanDrawLocks = 0;
     m_FS = new wxFileSystem();
 #if wxUSE_STATUSBAR

-    m_RelatedStatusBar = -1;
+    m_RelatedStatusBar = NULL;
+    m_RelatedStatusBarIndex = -1;

 #endif // wxUSE_STATUSBAR
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");
 #endif // wxUSE_STATUSBAR
     m_RelatedFrame = NULL;
     m_TitleFormat = wxT("%s");


@@ -363,10 +365,17 @@ void wxHtmlWindow::SetRelatedFrame(wxFrame* frame, const wxString& format)
 
 
 #if wxUSE_STATUSBAR
 
 
 #if wxUSE_STATUSBAR

-void wxHtmlWindow::SetRelatedStatusBar(int bar)
+void wxHtmlWindow::SetRelatedStatusBar(int index)

 {
 {

-    m_RelatedStatusBar = bar;
+    m_RelatedStatusBarIndex = index;

 }
 }

+
+void wxHtmlWindow::SetRelatedStatusBar(wxStatusBar* statusbar, int index)
+{
+    m_RelatedStatusBar =  statusbar;
+    m_RelatedStatusBarIndex = index;
+}
+

 #endif // wxUSE_STATUSBAR
 
 
 #endif // wxUSE_STATUSBAR
 
 


@@ -510,9 +519,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         needs_refresh = true;
 #if wxUSE_STATUSBAR
         // load&display it:
         needs_refresh = true;
 #if wxUSE_STATUSBAR
         // load&display it:

-        if (m_RelatedStatusBar != -1)
+        if (m_RelatedStatusBarIndex != -1)

         {
         {

-            m_RelatedFrame->SetStatusText(_("Connecting..."), m_RelatedStatusBar);
+            SetHTMLStatusText(_("Connecting..."));

             Refresh(false);
         }
 #endif // wxUSE_STATUSBAR
             Refresh(false);
         }
 #endif // wxUSE_STATUSBAR


@@ -541,10 +550,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             wxString src = wxEmptyString;
 
 #if wxUSE_STATUSBAR
             wxString src = wxEmptyString;
 
 #if wxUSE_STATUSBAR

-            if (m_RelatedStatusBar != -1)
+            if (m_RelatedStatusBarIndex != -1)

             {
                 wxString msg = _("Loading : ") + location;
             {
                 wxString msg = _("Loading : ") + location;

-                m_RelatedFrame->SetStatusText(msg, m_RelatedStatusBar);
+                SetHTMLStatusText(msg);

                 Refresh(false);
             }
 #endif // wxUSE_STATUSBAR
                 Refresh(false);
             }
 #endif // wxUSE_STATUSBAR


@@ -577,8 +586,10 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             delete f;
 
 #if wxUSE_STATUSBAR
             delete f;
 
 #if wxUSE_STATUSBAR

-            if (m_RelatedStatusBar != -1)
-                m_RelatedFrame->SetStatusText(_("Done"), m_RelatedStatusBar);
+            if (m_RelatedStatusBarIndex != -1)
+            {
+                SetHTMLStatusText(_("Done"));
+            }

 #endif // wxUSE_STATUSBAR
         }
     }
 #endif // wxUSE_STATUSBAR
         }
     }


@@ -1612,8 +1623,17 @@ void wxHtmlWindow::SetHTMLBackgroundImage(const wxBitmap& bmpBg)
 void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
 {
 #if wxUSE_STATUSBAR
 void wxHtmlWindow::SetHTMLStatusText(const wxString& text)
 {
 #if wxUSE_STATUSBAR

-    if (m_RelatedStatusBar != -1)
-        m_RelatedFrame->SetStatusText(text, m_RelatedStatusBar);
+    if (m_RelatedStatusBarIndex != -1)
+    {
+        if (m_RelatedStatusBar)
+        {
+            m_RelatedStatusBar->SetStatusText(text, m_RelatedStatusBarIndex);
+        }
+        else if (m_RelatedFrame)
+        {
+            m_RelatedFrame->SetStatusText(text, m_RelatedStatusBarIndex);
+        }
+    }

 #else
     wxUnusedVar(text);
 #endif // wxUSE_STATUSBAR
 #else
     wxUnusedVar(text);
 #endif // wxUSE_STATUSBAR