# pragma implementation "wxlwindow.h"
#endif
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
#ifdef __BORLANDC__
# pragma hdrstop
{
GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());
- wxScrolledWindow::Clear();
+ //wxScrolledWindow::Clear();
ResizeScrollbars(true);
SetDirty();
SetModified(FALSE);
{
//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;
if( m_StatusBar && m_StatusFieldLabel != -1 &&
s_hasPutMessageInStatusBar )
{
- m_StatusBar->SetStatusText("", m_StatusFieldLabel);
+ m_StatusBar->SetStatusText(wxEmptyString, m_StatusFieldLabel);
}
}
}
// 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;
Copy(TRUE, TRUE);
break;
case 's': // search
- Find("");
+ Find(wxEmptyString);
break;
case 't': // search again
FindAgain();
}
break;
case 's': // search
- Find("");
+ Find(wxEmptyString);
break;
case 't': // search again
FindAgain();
&& 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
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);
}
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!!!
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;
(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,
// ----------------------------------------------------------------------------
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;