Added more '#pragma implementation' for gcc.

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

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index b3646bef6a281ff495b364863716fdd3b0805e7f..4e3db4bf49f8998235e64a934d0b608c19047c67 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -27,7 +27,6 @@
 #include "wx/generic/scrolwin.h"
 #include "wx/panel.h"
 
 #include "wx/generic/scrolwin.h"
 #include "wx/panel.h"
 

-#if !USE_SHARED_LIBRARY

 BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
     EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
     EVT_SIZE(wxScrolledWindow::OnSize)
 BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
     EVT_SCROLLWIN(wxScrolledWindow::OnScroll)
     EVT_SIZE(wxScrolledWindow::OnSize)


@@ -35,7 +34,6 @@ BEGIN_EVENT_TABLE(wxScrolledWindow, wxPanel)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)

-#endif

 
 #ifdef __WXMSW__
 #include "windows.h"
 
 #ifdef __WXMSW__
 #include "windows.h"


@@ -43,7 +41,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxScrolledWindow, wxPanel)
 
 #ifdef __WXMOTIF__
 // For wxRETAINED implementation
 
 #ifdef __WXMOTIF__
 // For wxRETAINED implementation

+#ifdef __VMS__ //VMS's Xm.h is not (yet) compatible with C++
+               //This code switches off the compiler warnings
+# pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+# pragma message enable nosimpint
+#endif

 #endif
 
 wxScrolledWindow::wxScrolledWindow()
 #endif
 
 wxScrolledWindow::wxScrolledWindow()


@@ -149,11 +154,20 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
     AdjustScrollbars();
    
     if (do_refresh && !noRefresh) 
     AdjustScrollbars();
    
     if (do_refresh && !noRefresh) 

-       m_targetWindow->Refresh(); 
+        m_targetWindow->Refresh(); 

    
 #ifdef __WXMSW__
    
 #ifdef __WXMSW__

-   // Necessary?
-    UpdateWindow ((HWND) GetHWND());
+    // GRG: if this turns out to be really necessary, we could
+    //   at least move it to the above if { ... } so that it is
+    //   only done if noRefresh = FALSE (the default). OTOH, if
+    //   this doesn't break anything, which seems to be the
+    //   case, we could just leave it out.
+
+    // Necessary?
+    // UpdateWindow ((HWND) m_targetWindow->GetHWND());
+#endif
+#ifdef __WXMAC__
+               m_targetWindow->MacUpdateImmediately() ;

 #endif
 }
 
 #endif
 }
 


@@ -213,6 +227,9 @@ void wxScrolledWindow::OnScroll(wxScrollWinEvent& event)
         else
             m_targetWindow->Refresh();
   }
         else
             m_targetWindow->Refresh();
   }

+#ifdef __WXMAC__
+       m_targetWindow->MacUpdateImmediately() ;
+#endif

 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)
 }
 
 int wxScrolledWindow::CalcScrollInc(wxScrollWinEvent& event)


@@ -334,14 +351,14 @@ void wxScrolledWindow::AdjustScrollbars()
 
     if (m_xScrollLines > 0)
     {
 
     if (m_xScrollLines > 0)
     {

-       // Calculate page size i.e. number of scroll units you get on the
-       // current client window
+           // Calculate page size i.e. number of scroll units you get on the
+           // current client window

         int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus
         int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus

-       // the visible portion of it or if below zero
-       m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition);
+           // the visible portion of it or if below zero
+           m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition);

         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
 
         SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);
         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
 
         SetScrollbar(wxHORIZONTAL, m_xScrollPosition, noPagePositions, m_xScrollLines);


@@ -356,13 +373,13 @@ void wxScrolledWindow::AdjustScrollbars()
     
     if (m_yScrollLines > 0)
     {
     
     if (m_yScrollLines > 0)
     {

-       // Calculate page size i.e. number of scroll units you get on the
-       // current client window
+           // Calculate page size i.e. number of scroll units you get on the
+           // current client window

         int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus
         int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus

-       // the visible portion of it or if below zero
+           // the visible portion of it or if below zero

         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
 
         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
 


@@ -478,45 +495,43 @@ void wxScrolledWindow::Scroll( int x_pos, int y_pos )
         int old_x = m_xScrollPosition;
         m_xScrollPosition = x_pos;
     
         int old_x = m_xScrollPosition;
         m_xScrollPosition = x_pos;
     

-       // Calculate page size i.e. number of scroll units you get on the
-       // current client window
+           // Calculate page size i.e. number of scroll units you get on the
+           // current client window

         int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus
         int noPagePositions = (int) ( (w/(double)m_xScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus

-       // the visible portion of it or if below zero
+           // the visible portion of it or if below zero

         m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition );
         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
       
         m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
        
         m_xScrollPosition = wxMin( m_xScrollLines-noPagePositions, m_xScrollPosition );
         m_xScrollPosition = wxMax( 0, m_xScrollPosition );
       
         m_targetWindow->SetScrollPos( wxHORIZONTAL, m_xScrollPosition, TRUE );
        

-       m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );
+           m_targetWindow->ScrollWindow( (old_x-m_xScrollPosition)*m_xScrollPixelsPerLine, 0 );

     }
     if (y_pos != -1)
     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;
        
     }
     if (y_pos != -1)
     {
         int old_y = m_yScrollPosition;
         m_yScrollPosition = y_pos;
        

-       // Calculate page size i.e. number of scroll units you get on the
-       // current client window
+           // Calculate page size i.e. number of scroll units you get on the
+           // current client window

         int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus
         int noPagePositions = (int) ( (h/(double)m_yScrollPixelsPerLine) + 0.5 );
         if (noPagePositions < 1) noPagePositions = 1;
 
         // Correct position if greater than extent of canvas minus

-       // the visible portion of it or if below zero
+           // the visible portion of it or if below zero

         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
        
         m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
        
         m_yScrollPosition = wxMin( m_yScrollLines-noPagePositions, m_yScrollPosition );
         m_yScrollPosition = wxMax( 0, m_yScrollPosition );
        
         m_targetWindow->SetScrollPos( wxVERTICAL, m_yScrollPosition, TRUE );
        

-       m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );
+           m_targetWindow->ScrollWindow( 0, (old_y-m_yScrollPosition)*m_yScrollPixelsPerLine );

     }
     
     
     }
     
     

-#ifdef __WXMSW__
-//    ::UpdateWindow ((HWND) GetHWND());
-#else
-//    Refresh();
+#ifdef __WXMAC__
+               m_targetWindow->MacUpdateImmediately() ;

 #endif
 }
 
 #endif
 }
 


@@ -535,7 +550,7 @@ void wxScrolledWindow::GetVirtualSize (int *x, int *y) const
 }
 
 // Where the current view starts from
 }
 
 // Where the current view starts from

-void wxScrolledWindow::ViewStart (int *x, int *y) const
+void wxScrolledWindow::GetViewStart (int *x, int *y) const

 {
     if ( x )
         *x = m_xScrollPosition;
 {
     if ( x )
         *x = m_xScrollPosition;