fixed bakefile so that in-tree headers take precedence over system-installed ones

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

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index b8158f2e5b7d8e69fd6d81bba4742ff2fd683194..08fa914c345f228abc2e88e2b68ceb3e58701681 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -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);
@@ -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);
          }
       }
    }
@@ -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
@@ -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!!!
@@ -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;