Fix a number of mingw compile errors.

[wxWidgets.git] / src / gtk / scrolwin.cpp

diff --git a/src/gtk/scrolwin.cpp b/src/gtk/scrolwin.cpp
index f5e5b78e8cd8351ec50d41e0e9e46b9555c5ca38..291b30a49dba29c0b9c7a0c8e31ba29d1d918f5b 100644 (file)
--- a/src/gtk/scrolwin.cpp
+++ b/src/gtk/scrolwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/scrolwin.cpp
+// Name:        src/gtk/scrolwin.cpp

 // Purpose:     wxScrolledWindow implementation
 // Author:      Robert Roebling
 // Modified by: Ron Lee
 // Purpose:     wxScrolledWindow implementation
 // Author:      Robert Roebling
 // Modified by: Ron Lee


@@ -20,6 +20,7 @@
 #include "wx/scrolwin.h"
 
 #include <gtk/gtk.h>
 #include "wx/scrolwin.h"
 
 #include <gtk/gtk.h>

+#include "wx/gtk/private/gtk2-compat.h"

 
 // ----------------------------------------------------------------------------
 // wxScrollHelper implementation
 
 // ----------------------------------------------------------------------------
 // wxScrollHelper implementation


@@ -30,10 +31,15 @@ void wxScrollHelper::SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY,
                                    int xPos, int yPos,
                                    bool noRefresh)
 {
                                    int xPos, int yPos,
                                    bool noRefresh)
 {

-    m_win->m_scrollBar[wxWindow::ScrollDir_Horz]->adjustment->value = xPos;
-    m_win->m_scrollBar[wxWindow::ScrollDir_Vert]->adjustment->value = yPos;

     base_type::SetScrollbars(
         pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);
     base_type::SetScrollbars(
         pixelsPerUnitX, pixelsPerUnitY, noUnitsX, noUnitsY, xPos, yPos, noRefresh);

+
+    gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz], m_xScrollPosition);
+    gtk_range_set_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert], m_yScrollPosition);
+    m_win->m_scrollPos[wxWindow::ScrollDir_Horz] =
+        gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Horz]);
+    m_win->m_scrollPos[wxWindow::ScrollDir_Vert] =
+        gtk_range_get_value(m_win->m_scrollBar[wxWindow::ScrollDir_Vert]);

 }
 
 void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
 }
 
 void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,


@@ -44,6 +50,9 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
                                        int *lines,
                                        int *linesPerPage)
 {
                                        int *lines,
                                        int *linesPerPage)
 {

+    if (!range)
+        return;
+

     int upper;
     int page_size;
     if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)
     int upper;
     int page_size;
     if (pixelsPerLine > 0 && winSize > 0 && winSize < virtSize)


@@ -63,10 +72,8 @@ void wxScrollHelper::DoAdjustScrollbar(GtkRange* range,
         *linesPerPage = 0;
     }
 
         *linesPerPage = 0;
     }
 

-    GtkAdjustment* adj = range->adjustment;
-    adj->step_increment = 1;
-    adj->page_increment =
-    adj->page_size = page_size;
+    gtk_range_set_increments(range, 1, page_size);
+    gtk_adjustment_set_page_size(gtk_range_get_adjustment(range), page_size);

     gtk_range_set_range(range, 0, upper);
 
     // ensure that the scroll position is always in valid range
     gtk_range_set_range(range, 0, upper);
 
     // ensure that the scroll position is always in valid range


@@ -138,7 +145,7 @@ void wxScrollHelper::DoScrollOneDir(int orient,
 
 void wxScrollHelper::DoScroll( int x_pos, int y_pos )
 {
 
 void wxScrollHelper::DoScroll( int x_pos, int y_pos )
 {

-    wxCHECK_RET( m_targetWindow != 0, _T("No target window") );
+    wxCHECK_RET( m_targetWindow != 0, wxT("No target window") );

 
     DoScrollOneDir(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
     DoScrollOneDir(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);
 
     DoScrollOneDir(wxHORIZONTAL, x_pos, m_xScrollPixelsPerLine, &m_xScrollPosition);
     DoScrollOneDir(wxVERTICAL, y_pos, m_yScrollPixelsPerLine, &m_yScrollPosition);


@@ -164,6 +171,10 @@ GtkPolicyType GtkPolicyFromWX(wxScrollbarVisibility visibility)
             policy = GTK_POLICY_AUTOMATIC;
             break;
 
             policy = GTK_POLICY_AUTOMATIC;
             break;
 

+        default:
+            wxFAIL_MSG( wxS("unknown scrollbar visibility") );
+            // fall through
+

         case wxSHOW_SB_ALWAYS:
             policy = GTK_POLICY_ALWAYS;
             break;
         case wxSHOW_SB_ALWAYS:
             policy = GTK_POLICY_ALWAYS;
             break;