X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..8d0089653228874c88553e9494d8077b27ea6cd3:/samples/richedit/wxlwindow.cpp

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index 125790f178..08fa914c34 100644
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -18,7 +18,7 @@
 #   pragma implementation "wxlwindow.h"
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #  pragma hdrstop
@@ -214,7 +214,7 @@ wxLayoutWindow::Clear(int family,
 {
    GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
    SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());
-   wxScrolledWindow::Clear();
+   //wxScrolledWindow::Clear();
    ResizeScrollbars(true);
    SetDirty();
    SetModified(FALSE);
@@ -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;
-      ViewStart(&left, &top);
+      GetViewStart(&left, &top);
       wxSize size = GetClientSize();
       int xdelta, ydelta;
       
@@ -334,7 +334,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
          if( m_StatusBar && m_StatusFieldLabel != -1 &&
              s_hasPutMessageInStatusBar )
          {
-            m_StatusBar->SetStatusText("", m_StatusFieldLabel);
+            m_StatusBar->SetStatusText(wxEmptyString, m_StatusFieldLabel);
          }
       }
    }
@@ -373,7 +373,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
             
       // 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;
@@ -576,7 +576,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
             Copy(TRUE, TRUE);
             break;
          case 's': // search
-            Find("");
+            Find(wxEmptyString);
             break;
          case 't': // search again
             FindAgain();
@@ -624,7 +624,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                }
                break;
             case 's': // search
-               Find("");
+               Find(wxEmptyString);
                break;
             case 't': // search again
                FindAgain();
@@ -741,8 +741,11 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                      && m_WrapMargin > 0
                      && m_llist->GetCursorPos().x > m_WrapMargin
                      && isspace(keyCode))
+                  {
                      m_llist->WrapLine(m_WrapMargin);
-                  m_llist->Insert((char)keyCode);
+                  }
+                  
+                  m_llist->Insert((wxChar)keyCode);
                   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:
-   ViewStart(&x0,&y0);
+   GetViewStart(&x0,&y0);
    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);
@@ -843,7 +846,13 @@ wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))
 }
 
 void
-wxLayoutWindow::RequestUpdate(const wxRect *updateRect)
+wxLayoutWindow::RequestUpdate(const wxRect *
+                                            #ifdef __WXGTK__
+                                            updateRect
+                                            #else
+                                            WXUNUSED(updateRect)
+                                            #endif
+                                            )
 {
 #ifdef __WXGTK__
    // Calling Refresh() causes bad flicker under wxGTK!!!
@@ -871,7 +880,7 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect)
    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;
 
@@ -1093,7 +1102,7 @@ wxLayoutWindow::ResizeScrollbars(bool exact)
          (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,
@@ -1260,9 +1269,27 @@ wxLayoutWindow::Cut(bool privateFormat, bool usePrimary)
 // ----------------------------------------------------------------------------
 
 bool
-wxLayoutWindow::Find(const wxString &needle,
-                     wxPoint * fromWhere,
-                     const wxString &configPath)
+wxLayoutWindow::Find(const wxString &
+                                     #ifdef M_BASEDIR
+                                     needle
+                                     #else
+                                     WXUNUSED(needle)
+                                     #endif
+                                     ,
+                     wxPoint * 
+                                     #ifdef M_BASEDIR
+                                     fromWhere
+                                     #else
+                                     WXUNUSED(fromWhere)
+                                     #endif
+                                     ,
+                     const wxString &
+                                     #ifdef M_BASEDIR
+                                     configPath
+                                     #else
+                                     WXUNUSED(configPath)
+                                     #endif
+                                     )
 {
 #ifdef M_BASEDIR
    wxPoint found;