wxHTML compilation fixes

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

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index c9e56751ee3af5eab5abd6300ac49e6232382424..8b85a33b670c0a12ae624e80b04ce91cd2b61e95 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -158,7 +158,8 @@ bool wxFTP::SendCommand(const wxString& command, char exp_ret)
 
 bool wxFTP::GetResult(char exp)
 {
-  if ((m_lastError = GetLine(this, m_lastResult)))
+  m_lastError = GetLine(this, m_lastResult);
+  if ( m_lastError )
     return FALSE;
   if (m_lastResult.GetChar(0) != exp) {
     m_lastError = wxPROTO_PROTERR;
@@ -171,7 +172,8 @@ bool wxFTP::GetResult(char exp)
     key += _T(' ');
 
     while (m_lastResult.Index(key) != 0) {
-      if ((m_lastError = GetLine(this, m_lastResult)))
+      m_lastError = GetLine(this, m_lastResult);
+      if ( m_lastError )
         return FALSE;
     }
   }

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 8100e613687f58c6b6a408b66e75dbc78eed092b..e4b086669bb1bc3b730f8cb3a7aea6988c5ba362 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -601,7 +601,7 @@ GSocketEventFlags wxSocketBase::EventToNotify(GSocketEvent evt)
     return GSOCK_OUTPUT_FLAG;
   case GSOCK_CONNECTION:
     return GSOCK_CONNECTION_FLAG;
-  case GSOCK_LOST_FLAG:
+  case GSOCK_LOST:
     return GSOCK_LOST_FLAG;
   default:
     return 0;

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 66e90901e2311788d672bb6c0ad20480b5c24f3e..8f41a07d931675bde87f210e799a9bdaaa4d45c7 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -294,9 +294,9 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
 }
 
 wxFrame *
-wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
-                                         wxPoint *pos = NULL,
-                                         bool *newframe = NULL)
+wxHelpControllerHtml::GetFrameParameters(wxSize *size,
+                                         wxPoint *pos,
+                                         bool *newframe)
 {
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;

diff --git a/src/html/htmlfilter.cpp b/src/html/htmlfilter.cpp
index 8673e543571ecfd1059a386f0904fbdd068152a5..e56f3203a1b5a87d91c9c869ffe1f45339c81b1f 100644 (file)
--- a/src/html/htmlfilter.cpp
+++ b/src/html/htmlfilter.cpp
@@ -57,9 +57,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file)
     wxString doc, doc2;
 
     if (s == NULL) return wxEmptyString;
-    src = new char[s -> StreamSize()+1];
-    src[s -> StreamSize()] = 0;
-    s -> Read(src, s -> StreamSize());
+    src = new char[s -> GetSize()+1];
+    src[s -> GetSize()] = 0;
+    s -> Read(src, s -> GetSize());
     doc = src;
     delete [] src;
 
@@ -137,9 +137,9 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file)
     wxString doc;
 
     if (s == NULL) return wxEmptyString;
-    src = (char*) malloc(s -> StreamSize() + 1);
-    src[s -> StreamSize()] = 0;
-    s -> Read(src, s -> StreamSize());
+    src = (char*) malloc(s -> GetSize() + 1);
+    src[s -> GetSize()] = 0;
+    s -> Read(src, s -> GetSize());
     doc = src;
     free(src);
 

diff --git a/src/html/htmlhelp.cpp b/src/html/htmlhelp.cpp
index 0f75ef0580a926ee412f02d182321f1b770a464c..a208ea5caf064bc7007ddce0d83d2d534bf7182d 100644 (file)
--- a/src/html/htmlhelp.cpp
+++ b/src/html/htmlhelp.cpp
@@ -243,7 +243,7 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
     if (fi == NULL) return FALSE;
     fsys.ChangePathTo(bookFull);
     s = fi -> GetStream();
-    sz = s -> StreamSize();
+    sz = s -> GetSize();
     buff = (char*) malloc(sz+1);
     buff[sz] = 0;
     s -> Read(buff, sz);
@@ -724,7 +724,7 @@ void wxHtmlHelpController::ReadCustomization(wxConfigBase *cfg, wxString path)
         cfg -> SetPath(path);
     }
 
-    m_Cfg.navig_on = (bool) cfg -> Read("hcNavigPanel", m_Cfg.navig_on);
+    m_Cfg.navig_on = cfg -> Read("hcNavigPanel", m_Cfg.navig_on) != 0;
     m_Cfg.sashpos = cfg -> Read("hcSashPos", m_Cfg.sashpos);
     m_Cfg.x = cfg -> Read("hcX", m_Cfg.x);
     m_Cfg.y = cfg -> Read("hcY", m_Cfg.y);

diff --git a/src/html/htmlhelp_io.cpp b/src/html/htmlhelp_io.cpp
index b4d82e7ec91704e5c272188d153e987d18e26364..001f085a397e155827be136818f354f17046945c 100644 (file)
--- a/src/html/htmlhelp_io.cpp
+++ b/src/html/htmlhelp_io.cpp
@@ -129,7 +129,7 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
 
     f = fsys.OpenFile(contentsfile);
     if (f) {
-        sz = f -> GetStream() -> StreamSize();
+        sz = f -> GetStream() -> GetSize();
         buf = (char*) malloc(sz+1);
         buf[sz] = 0;
         f -> GetStream() -> Read(buf, sz);
@@ -142,7 +142,7 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
 
     f = fsys.OpenFile(indexfile);
     if (f) {
-        sz = f -> GetStream() -> StreamSize();
+        sz = f -> GetStream() -> GetSize();
         buf = (char*) malloc(sz+1);
         buf[sz] = 0;
         f -> GetStream() -> Read(buf, sz);

diff --git a/src/html/search.cpp b/src/html/search.cpp
index aab3906fd5206990fb7a4144f92018dd5511c711..506f382db7917a813ed38cd075352664c48cdfef 100644 (file)
--- a/src/html/search.cpp
+++ b/src/html/search.cpp
@@ -50,7 +50,7 @@ bool wxSearchEngine::Scan(wxInputStream *stream)
     wxASSERT_MSG(m_Keyword != NULL, _("wxSearchEngine::LookFor must be called before scanning!"));
 
     int i, j;
-    int lng = stream -> StreamSize();
+    int lng = stream ->GetSize();
     int wrd = strlen(m_Keyword);
     bool found = FALSE;
     char *buf = (char*) malloc(lng + 1);