Compile fixes.

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

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index ec72f8f37719fdcb511712341354450d6fc4b00e..1718f736641a6f265bb16a015eda03a625441191 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -28,7 +28,7 @@
 #endif
 
 #ifndef NO_TEXT_WINDOW_STREAM
 #endif
 
 #ifndef NO_TEXT_WINDOW_STREAM

-    #ifdef wxUSE_STD_IOSTREAM
+    #if wxUSE_STD_IOSTREAM

         #include "ioswrap.h"    // for iostream classes if we need them
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all
         #include "ioswrap.h"    // for iostream classes if we need them
     #else // !wxUSE_STD_IOSTREAM
         // can't compile this feature in if we don't use streams at all

diff --git a/src/common/fs_inet.cpp b/src/common/fs_inet.cpp
index 3c016825ac61769f6d5abbeaed69977eecbe4a7d..b9f2bed17578089b421414855c7a09054d47fd50 100644 (file)
--- a/src/common/fs_inet.cpp
+++ b/src/common/fs_inet.cpp
@@ -64,15 +64,13 @@ class wxInetCacheNode : public wxObject
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);
 bool wxInternetFSHandler::CanOpen(const wxString& location)
 {
     wxString p = GetProtocol(location);

-    return (p == "http") || (p == "ftp");
+    return (p == _T("http")) || (p == _T("ftp"));

 }
 
 
 }
 
 

-
-

 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
 wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {

-    wxString right = GetProtocol(location) + ":" + GetRightLocation(location);
+    wxString right = GetProtocol(location) + _T(":") + GetRightLocation(location);

     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;
     wxInputStream *s;
     wxString content;
     wxInetCacheNode *info;


@@ -80,15 +78,17 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:
     info = (wxInetCacheNode*) m_Cache.Get(right);
 
     // Add item into cache:

-    if (info == NULL) {
+    if (!info == NULL) 
+    {

         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);
         wxURL url(right);
         s = url.GetInputStream();
         content = url.GetProtocol().GetContentType();
         if (content == wxEmptyString) content = GetMimeTypeFromExt(location);

-        if (s) {
+        if (s) 
+       {

             char buf[256];
 
             char buf[256];
 

-            wxGetTempFileName("wxhtml", buf);
+            wxGetTempFileName( "wxhtml", buf);

             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 
             info = new wxInetCacheNode(buf, content);
             m_Cache.Put(right, info);
 


@@ -98,18 +98,22 @@ wxFSFile* wxInternetFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxStri
             }
             delete s;
         }
             }
             delete s;
         }

-        else return NULL; //we can't open the URL
+        else
+       { 
+           return (wxFSFile*) NULL; // we can't open the URL
+       }

     }
 
     // Load item from cache:
     }
 
     // Load item from cache:

-    s = new wxFileInputStream(info -> GetTemp());
-    if (s) {
+    s = new wxFileInputStream(info->GetTemp());
+    if (s) 
+    {

         return new wxFSFile(s,
                             right,
         return new wxFSFile(s,
                             right,

-                            info -> GetMime(),
+                            info->GetMime(),

                             GetAnchor(location));
     }
                             GetAnchor(location));
     }

-    else return NULL;
+    else return (wxFSFile*) NULL;

 }
 
 
 }
 
 


@@ -120,9 +124,10 @@ wxInternetFSHandler::~wxInternetFSHandler()
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();
     wxInetCacheNode *n2;
 
     m_Cache.BeginFind();

-    while ((n = m_Cache.Next()) != NULL) {
-        n2 = (wxInetCacheNode*) n -> GetData();
-        wxRemoveFile(n2 -> GetTemp());
+    while ((n = m_Cache.Next()) != NULL) 
+    {
+        n2 = (wxInetCacheNode*) n->GetData();
+        wxRemoveFile(n2->GetTemp());

         delete n2;
     }
 }
         delete n2;
     }
 }

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index a0eff69c7434281af6250b2a20f522218588b23d..85c6fd6c76df0627c5fb50345c79644625b1f2bf 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -2260,17 +2260,20 @@ void wxWindow::DoSetClientSize( int width, int height )
         int dw = 0;
         int dh = 0;
 
         int dw = 0;
         int dh = 0;
 

-        GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-        GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
-

 #if (GTK_MINOR_VERSION == 0)
 #if (GTK_MINOR_VERSION == 0)

-        GtkWidget *viewport = scroll_window->viewport;
-        GtkStyleClass *viewport_class = viewport->style->klass;
-

         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         {
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         {

-            dw += 2 * viewport_class->xthickness;
-            dh += 2 * viewport_class->ythickness;
+            if (HasScrolling())
+            {
+                GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+                GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+
+                GtkWidget *viewport = scroll_window->viewport;
+                GtkStyleClass *viewport_class = viewport->style->klass;
+
+                dw += 2 * viewport_class->xthickness;
+                dh += 2 * viewport_class->ythickness;
+            }

         }
 #else
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         }
 #else
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))


@@ -2290,6 +2293,9 @@ void wxWindow::DoSetClientSize( int width, int height )
             we use this instead:  range.slider_width = 11 + 2*2pts edge
 */
 
             we use this instead:  range.slider_width = 11 + 2*2pts edge
 */
 

+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+

             if (scroll_window->vscrollbar_visible)
             {
                 dw += 15;   /* dw += vscrollbar->allocation.width; */
             if (scroll_window->vscrollbar_visible)
             {
                 dw += 15;   /* dw += vscrollbar->allocation.width; */

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index a0eff69c7434281af6250b2a20f522218588b23d..85c6fd6c76df0627c5fb50345c79644625b1f2bf 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -2260,17 +2260,20 @@ void wxWindow::DoSetClientSize( int width, int height )
         int dw = 0;
         int dh = 0;
 
         int dw = 0;
         int dh = 0;
 

-        GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
-        GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
-

 #if (GTK_MINOR_VERSION == 0)
 #if (GTK_MINOR_VERSION == 0)

-        GtkWidget *viewport = scroll_window->viewport;
-        GtkStyleClass *viewport_class = viewport->style->klass;
-

         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         {
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         {

-            dw += 2 * viewport_class->xthickness;
-            dh += 2 * viewport_class->ythickness;
+            if (HasScrolling())
+            {
+                GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+                GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+
+                GtkWidget *viewport = scroll_window->viewport;
+                GtkStyleClass *viewport_class = viewport->style->klass;
+
+                dw += 2 * viewport_class->xthickness;
+                dh += 2 * viewport_class->ythickness;
+            }

         }
 #else
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))
         }
 #else
         if (HasFlag(wxRAISED_BORDER) || HasFlag(wxSUNKEN_BORDER))


@@ -2290,6 +2293,9 @@ void wxWindow::DoSetClientSize( int width, int height )
             we use this instead:  range.slider_width = 11 + 2*2pts edge
 */
 
             we use this instead:  range.slider_width = 11 + 2*2pts edge
 */
 

+            GtkScrolledWindow *scroll_window = GTK_SCROLLED_WINDOW(m_widget);
+            GtkScrolledWindowClass *scroll_class = GTK_SCROLLED_WINDOW_CLASS( GTK_OBJECT(m_widget)->klass );
+

             if (scroll_window->vscrollbar_visible)
             {
                 dw += 15;   /* dw += vscrollbar->allocation.width; */
             if (scroll_window->vscrollbar_visible)
             {
                 dw += 15;   /* dw += vscrollbar->allocation.width; */