implemented DoGetSize() for wxSlider (patch from Dimitri)

[wxWidgets.git] / samples / richedit / wxlwindow.cpp

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 125790f1784825a60f6a9d17000373dd17341bf1..4383578c2cc3d3a1df89da3b241951a881a4f34e 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -18,7 +18,7 @@
 #   pragma implementation "wxlwindow.h"
 #endif
 
 #   pragma implementation "wxlwindow.h"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop


@@ -266,7 +266,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    {
       //WXLO_DEBUG(("selecting at : %d/%d", (int) event.GetX(), (int)event.GetY()));
       int left, top;
    {
       //WXLO_DEBUG(("selecting at : %d/%d", (int) event.GetX(), (int)event.GetY()));
       int left, top;

-      ViewStart(&left, &top);
+      GetViewStart(&left, &top);

       wxSize size = GetClientSize();
       int xdelta, ydelta;
       
       wxSize size = GetClientSize();
       int xdelta, ydelta;
       


@@ -373,7 +373,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
             
       // Calculate where the top of the visible area is:
       int x0, y0;
             
       // Calculate where the top of the visible area is:
       int x0, y0;

-      ViewStart(&x0,&y0);
+      GetViewStart(&x0,&y0);

       int dx, dy;
       GetScrollPixelsPerUnit(&dx, &dy);
       x0 *= dx; y0 *= dy;
       int dx, dy;
       GetScrollPixelsPerUnit(&dx, &dy);
       x0 *= dx; y0 *= dy;


@@ -741,8 +741,11 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                      && m_WrapMargin > 0
                      && m_llist->GetCursorPos().x > m_WrapMargin
                      && isspace(keyCode))
                      && m_WrapMargin > 0
                      && m_llist->GetCursorPos().x > m_WrapMargin
                      && isspace(keyCode))

+                  {

                      m_llist->WrapLine(m_WrapMargin);
                      m_llist->WrapLine(m_WrapMargin);

-                  m_llist->Insert((char)keyCode);
+                  }
+                  
+                  m_llist->Insert((wxChar)keyCode);

                   SetDirty();
                }
                else
                   SetDirty();
                }
                else


@@ -793,11 +796,11 @@ wxLayoutWindow::ScrollToCursor(void)
    int x0,y0,x1,y1, dx, dy;
 
    // Calculate where the top of the visible area is:
    int x0,y0,x1,y1, dx, dy;
 
    // Calculate where the top of the visible area is:

-   ViewStart(&x0,&y0);
+   GetViewStart(&x0,&y0);

    GetScrollPixelsPerUnit(&dx, &dy);
    x0 *= dx; y0 *= dy;
 
    GetScrollPixelsPerUnit(&dx, &dy);
    x0 *= dx; y0 *= dy;
 

-   WXLO_DEBUG(("ScrollToCursor: ViewStart is %d/%d", x0, y0));
+   WXLO_DEBUG(("ScrollToCursor: GetViewStart is %d/%d", x0, y0));

 
    // Get the size of the visible window:
    GetClientSize(&x1, &y1);
 
    // Get the size of the visible window:
    GetClientSize(&x1, &y1);


@@ -871,7 +874,7 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
    int x0,y0,x1,y1, dx, dy;
 
    // Calculate where the top of the visible area is:
    int x0,y0,x1,y1, dx, dy;
 
    // Calculate where the top of the visible area is:

-   ViewStart(&x0,&y0);
+   GetViewStart(&x0,&y0);

    GetScrollPixelsPerUnit(&dx, &dy);
    x0 *= dx; y0 *= dy;
 
    GetScrollPixelsPerUnit(&dx, &dy);
    x0 *= dx; y0 *= dy;
 


@@ -1093,7 +1096,7 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
          (max.x > size.x - X_SCROLL_PAGE|| max.y > size.y - Y_SCROLL_PAGE)
          )
       {
          (max.x > size.x - X_SCROLL_PAGE|| max.y > size.y - Y_SCROLL_PAGE)
          )
       {

-         ViewStart(&m_ViewStartX, &m_ViewStartY);
+         GetViewStart(&m_ViewStartX, &m_ViewStartY);

          SetScrollbars(X_SCROLL_PAGE,
                        Y_SCROLL_PAGE,
                        max.x / X_SCROLL_PAGE + 2,
          SetScrollbars(X_SCROLL_PAGE,
                        Y_SCROLL_PAGE,
                        max.x / X_SCROLL_PAGE + 2,