/*-*- c++ -*-********************************************************
* wxLwindow.h : a scrolled Window for displaying/entering rich text*
* *
- * (C) 1998, 1999 by Karsten Ballüder (Ballueder@usa.net) *
+ * (C) 1998, 1999 by Karsten Ballüder (Ballueder@usa.net) *
* *
* $Id$
*******************************************************************/
+// ===========================================================================
+// declarations
+// ===========================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
#ifdef __GNUG__
# pragma implementation "wxlwindow.h"
#endif
#include "wx/wxprec.h"
+
#ifdef __BORLANDC__
# pragma hdrstop
#endif
-
#include "Mpch.h"
+
#ifdef M_BASEDIR
# ifndef USE_PCH
# include "Mcommon.h"
# include "gui/wxlparser.h"
#else
# ifdef __WXMSW__
-# include <windows.h>
-# undef FindWindow
-# undef GetCharWidth
-# undef StartDoc
+# include <wx/msw/private.h>
# endif
# include "wxlwindow.h"
#include <wx/textctrl.h>
#include <wx/dataobj.h>
+#ifdef WXLAYOUT_USE_CARET
+# include <wx/caret.h>
+#endif // WXLAYOUT_USE_CARET
+
#include <ctype.h>
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
+
#ifdef WXLAYOUT_DEBUG
# define WXLO_DEBUG(x) wxLogDebug x
#else
# define WXLO_DEBUG(x)
#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
/// offsets to put a nice frame around text
#define WXLO_XOFFSET 4
#define WXLO_YOFFSET 4
#define WXLO_ROFFSET 20
#define WXLO_BOFFSET 20
+/// the size of one scrollbar page in pixels
+static const int X_SCROLL_PAGE = 10;
+static const int Y_SCROLL_PAGE = 20;
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow)
EVT_PAINT (wxLayoutWindow::OnPaint)
EVT_CHAR (wxLayoutWindow::OnChar)
EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)
END_EVENT_TABLE()
-wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
- : wxScrolledWindow(parent, -1, wxDefaultPosition, wxDefaultSize,
- wxHSCROLL | wxVSCROLL | wxBORDER)
+// ===========================================================================
+// implementation
+// ===========================================================================
+
+/* LEAVE IT HERE UNTIL WXGTK WORKS AGAIN!!! */
+#ifdef __WXGTK__
+/// allows me to compare to wxPoints
+static bool operator != (wxPoint const &p1, wxPoint const &p2)
+{
+ return p1.x != p2.x || p1.y != p2.y;
+}
+#endif // __WXGTK__
+
+#ifndef wxWANTS_CHARS
+ #define wxWANTS_CHARS 0
+#endif
+
+// ----------------------------------------------------------------------------
+// wxLayoutWindow
+// ----------------------------------------------------------------------------
+wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
+ : wxScrolledWindow(parent, -1,
+ wxDefaultPosition, wxDefaultSize,
+ wxHSCROLL | wxVSCROLL |
+ wxBORDER |
+ wxWANTS_CHARS)
{
+ SetStatusBar(NULL); // don't use statusbar
m_Editable = false;
m_doSendEvents = false;
m_ViewStartX = 0; m_ViewStartY = 0;
m_bitmap = new wxBitmap(4,4);
m_bitmapSize = wxPoint(4,4);
m_llist = new wxLayoutList();
+
m_BGbitmap = NULL;
m_ScrollToCursor = false;
SetWrapMargin(0);
wxPoint max = m_llist->GetSize();
- SetScrollbars(10, 20 /*lineHeight*/, max.x/10+1, max.y/20+1);
- EnableScrolling(true,true);
- m_maxx = max.x; m_maxy = max.y;
+ SetScrollbars(X_SCROLL_PAGE, Y_SCROLL_PAGE,
+ max.x / X_SCROLL_PAGE + 1, max.y / Y_SCROLL_PAGE + 1);
+ EnableScrolling(true, true);
+ m_maxx = max.x + X_SCROLL_PAGE;
+ m_maxy = max.y + Y_SCROLL_PAGE;
m_Selecting = false;
+
+#ifdef WXLAYOUT_USE_CARET
+ // FIXME cursor size shouldn't be hardcoded
+ wxCaret *caret = new wxCaret(this, 2, 20);
+ SetCaret(caret);
+ m_llist->SetCaret(caret);
+ caret->Show();
+#endif // WXLAYOUT_USE_CARET
+
+ SetCursorVisibility(-1);
SetCursor(wxCURSOR_IBEAM);
SetDirty();
}
wxColour *bg)
{
GetLayoutList()->Clear(family,size,style,weight,underline,fg,bg);
- SetBackgroundColour(GetLayoutList()->GetDefaults()->GetBGColour());
+ SetBackgroundColour(GetLayoutList()->GetDefaultStyleInfo().GetBGColour());
ResizeScrollbars(true);
SetDirty();
SetModified(false);
- wxRect r;
- int w,h;
- r.x = r.y = 0; GetSize(&w,&h);
- r.width = w;
- r.height = h;
- DoPaint(&r);
+ wxScrolledWindow::Clear();
+ DoPaint((wxRect *)NULL);
}
-#ifdef __WXMSW__
-long
-wxLayoutWindow::MSWGetDlgCode()
-{
- // if we don't return this, we won't get OnChar() events for TABs and ENTER
- return DLGC_WANTCHARS | DLGC_WANTARROWS | DLGC_WANTMESSAGE;
-}
-#endif //MSW
-
void
wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
{
- wxPaintDC dc( this );
- PrepareDC( dc );
- SetFocus();
+ wxClientDC dc( this );
+ PrepareDC( dc );
+ if ( eventId != WXLOWIN_MENU_MOUSEMOVE )
+ {
+ // moving the mouse in a window shouldn't give it the focus!
+ SetFocus();
+ }
wxPoint findPos;
findPos.x = dc.DeviceToLogicalX(event.GetX());
bool found;
wxLayoutObject *obj = m_llist->FindObjectScreen(dc, findPos,
&cursorPos, &found);
+ wxLayoutObject::UserData *u = obj ? obj->GetUserData() : NULL;
//has the mouse only been moved?
if(eventId == WXLOWIN_MENU_MOUSEMOVE)
{
// found is only true if we are really over an object, not just
// behind it
- if(found && obj && obj->GetUserData() != NULL)
+ if(found && u && ! m_Selecting)
{
if(!m_HandCursor)
SetCursor(wxCURSOR_HAND);
m_HandCursor = TRUE;
+ if(m_StatusBar && m_StatusFieldLabel != -1)
+ {
+ const wxString &label = u->GetLabel();
+ if(label.Length())
+ m_StatusBar->SetStatusText(label,
+ m_StatusFieldLabel);
+ }
}
else
{
if(m_HandCursor)
SetCursor(wxCURSOR_IBEAM);
m_HandCursor = FALSE;
+ if(m_StatusBar && m_StatusFieldLabel != -1)
+ m_StatusBar->SetStatusText("", m_StatusFieldLabel);
+ }
+ if(event.LeftIsDown())
+ {
+ if(! m_Selecting)
+ {
+ m_llist->StartSelection(wxPoint(-1, -1), m_ClickPosition);
+ m_Selecting = true;
+ DoPaint(); // TODO: we don't have to redraw everything!
+ }
+ else
+ {
+ m_llist->ContinueSelection(cursorPos, m_ClickPosition);
+ DoPaint(); // TODO: we don't have to redraw everything!
+ }
+ }
+ if(m_Selecting && ! event.LeftIsDown())
+ {
+ m_llist->EndSelection(cursorPos, m_ClickPosition);
+ m_Selecting = false;
+ DoPaint(); // TODO: we don't have to redraw everything!
}
- return;
- }
- // always move cursor to mouse click:
- if(obj && eventId == WXLOWIN_MENU_LCLICK)
+ if ( u )
+ {
+ u->DecRef();
+ u = NULL;
+ }
+ }
+ else if(eventId == WXLOWIN_MENU_LCLICK)
{
+ // always move cursor to mouse click:
m_llist->MoveCursorTo(cursorPos);
+
+ // clicking a mouse removes the selection
+ if ( m_llist->HasSelection() )
+ {
+ m_llist->DiscardSelection();
+ DoPaint(); // TODO: we don't have to redraw everything!
+ }
+
+ // Calculate where the top of the visible area is:
+ int x0, y0;
+ ViewStart(&x0,&y0);
+ int dx, dy;
+ GetScrollPixelsPerUnit(&dx, &dy);
+ x0 *= dx; y0 *= dy;
+
+ wxPoint offset(-x0+WXLO_XOFFSET, -y0+WXLO_YOFFSET);
+ m_llist->UpdateCursorScreenPos(dc, true, offset);
+
+ if(m_CursorVisibility == -1)
+ m_CursorVisibility = 1;
+
+ // VZ: this should be unnecessary because mouse can only click on a
+ // visible part of the canvas
+#if 0
ScrollToCursor();
- Refresh(FALSE); // DoPaint suppresses flicker under GTK
- }
- if(!m_doSendEvents) // nothing to do
- return;
+#endif // 0
- // only do the menu if activated, editable and not on a clickable object
- if(eventId == WXLOWIN_MENU_RCLICK
- && IsEditable()
- && (! obj || (obj && obj->GetUserData() == NULL))
- )
- {
- PopupMenu(m_PopupMenu, m_ClickPosition.x, m_ClickPosition.y);
- return;
+#ifdef __WXGTK__
+ DoPaint(); // DoPaint suppresses flicker under GTK
+#endif // wxGTK
}
- // find the object at this position
- if(obj)
+
+ // notify about mouse events?
+ if( m_doSendEvents )
{
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, eventId);
- commandEvent.SetEventObject( this );
- commandEvent.SetClientData((char *)obj);
- GetEventHandler()->ProcessEvent(commandEvent);
+ // only do the menu if activated, editable and not on a clickable object
+ if(eventId == WXLOWIN_MENU_RCLICK
+ && IsEditable()
+ && (! obj || u == NULL))
+ {
+ PopupMenu(m_PopupMenu, m_ClickPosition.x, m_ClickPosition.y);
+ if(u) u->DecRef();
+ return;
+ }
+
+ // find the object at this position
+ if(obj)
+ {
+ wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, eventId);
+ commandEvent.SetEventObject( this );
+ commandEvent.SetClientData((char *)obj);
+ GetEventHandler()->ProcessEvent(commandEvent);
+ }
}
+
+ if( u )
+ u->DecRef();
}
/*
wxLayoutWindow::OnChar(wxKeyEvent& event)
{
int keyCode = event.KeyCode();
-
+
#ifdef WXLAYOUT_DEBUG
if(keyCode == WXK_F1)
{
}
}
+ // If needed, make cursor visible:
+ if(m_CursorVisibility == -1)
+ m_CursorVisibility = 1;
+
/* These two nested switches work like this:
The first one processes all non-editing keycodes, to move the
cursor, etc. It's default will process all keycodes causing
modifications to the buffer, but only if editing is allowed.
*/
+ bool ctrlDown = event.ControlDown();
switch(keyCode)
{
case WXK_RIGHT:
- m_llist->MoveCursorHorizontally(1);
+ if ( ctrlDown )
+ m_llist->MoveCursorWord(1);
+ else
+ m_llist->MoveCursorHorizontally(1);
break;
case WXK_LEFT:
- m_llist->MoveCursorHorizontally(-1);
+ if ( ctrlDown )
+ m_llist->MoveCursorWord(-1);
+ else
+ m_llist->MoveCursorHorizontally(-1);
break;
case WXK_UP:
m_llist->MoveCursorVertically(-1);
m_llist->MoveCursorVertically(1);
break;
case WXK_PRIOR:
- m_llist->MoveCursorVertically(-20);
+ m_llist->MoveCursorVertically(-Y_SCROLL_PAGE);
break;
case WXK_NEXT:
- m_llist->MoveCursorVertically(20);
+ m_llist->MoveCursorVertically(Y_SCROLL_PAGE);
break;
case WXK_HOME:
- m_llist->MoveCursorToBeginOfLine();
+ if ( ctrlDown )
+ m_llist->MoveCursorTo(wxPoint(0, 0));
+ else
+ m_llist->MoveCursorToBeginOfLine();
break;
case WXK_END:
- m_llist->MoveCursorToEndOfLine();
+ if ( ctrlDown )
+ m_llist->MoveCursorTo(m_llist->GetSize());
+ else
+ m_llist->MoveCursorToEndOfLine();
break;
+
default:
- if(keyCode == 'c' && event.ControlDown())
+ if(keyCode == 'c' && ctrlDown)
+ {
+ // this should work even in read-only mode
Copy();
- if( IsEditable() )
+ }
+ else if( IsEditable() )
{
/* First, handle control keys */
if(event.ControlDown() && ! event.AltDown())
{
switch(keyCode)
{
+ case WXK_INSERT:
+ Copy();
+ break;
case WXK_DELETE :
case 'd':
m_llist->Delete(1);
case 'v':
Paste();
break;
+ case 'x':
+ Cut();
+ break;
#ifdef WXLAYOUT_DEBUG
case WXK_F1:
m_llist->SetFont(-1,-1,-1,-1,true); // underlined
Paste();
break;
case WXK_DELETE :
- m_llist->Delete(1);
+ if(event.ShiftDown())
+ Cut();
+ else
+ m_llist->Delete(1);
break;
case WXK_BACK: // backspace
if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
&& (keyCode < 256 && keyCode >= 32)
)
{
- wxString tmp;
- tmp += keyCode;
if(m_WrapMargin > 0 && isspace(keyCode))
m_llist->WrapLine(m_WrapMargin);
- m_llist->Insert(tmp);
+ m_llist->Insert((char)keyCode);
}
break;
}
}
SetDirty();
SetModified();
- }// if(IsEditable())
+ }// if(IsEditable())
}// first switch()
if(m_Selecting)
{
}
}
+ // we must call ResizeScrollbars() before ScrollToCursor(), otherwise the
+ // ne cursor position might be outside the current scrolllbar range
+ ResizeScrollbars();
ScrollToCursor();
- wxRect r = *m_llist->GetUpdateRect();
- DoPaint(&r);
+
+ // refresh the screen
+ DoPaint(m_llist->GetUpdateRect());
}
void
wxLayoutWindow::OnKeyUp(wxKeyEvent& event)
{
if(event.KeyCode() == WXK_SHIFT && m_llist->IsSelecting())
+ {
m_llist->EndSelection();
+ m_Selecting = false;
+ }
event.Skip();
}
x0 *= dx; y0 *= dy;
WXLO_DEBUG(("ScrollToCursor: ViewStart is %d/%d", x0, y0));
-
+
// Get the size of the visible window:
GetClientSize(&x1,&y1);
- wxASSERT(x1 > 0);
- wxASSERT(y1 > 0);
- // As we have the values anyway, use them to avoid unnecessary
- // scrollbar updates.
- if(x1 > m_maxx) m_maxx = x1;
+
+ // notice that the client size may be (0, 0)...
+ wxASSERT(x1 >= 0 && y1 >= 0);
+
+ // VZ: I think this is false - if you do it here, ResizeScrollbars() won't
+ // call SetScrollbars() later
+#if 0
+ // As we have the values anyway, use them to avoid unnecessary scrollbar
+ // updates.
+ if(x1 > m_maxx) m_maxx = x1;
if(y1 > m_maxy) m_maxy = y1;
- /* Make sure that the scrollbars are at a position so that the
- cursor is visible if we are editing. */
- /** Scroll so that cursor is visible! */
+#endif // 0
+
+ // Make sure that the scrollbars are at a position so that the cursor is
+ // visible if we are editing
WXLO_DEBUG(("m_ScrollToCursor = %d", (int) m_ScrollToCursor));
- wxPoint cc = m_llist->GetCursorScreenPos(*m_memDC);
- if(cc.x < x0 || cc.y < y0
- || cc.x >= x0+(9*x1)/10 || cc.y >= y0+(9*y1/10)) // (9*x)/10 == 90%
+ wxPoint cc = m_llist->GetCursorScreenPos(dc);
+
+ // the cursor should be completely visible in both directions
+ wxPoint cs(m_llist->GetCursorSize());
+ int nx = -1,
+ ny = -1;
+ if ( cc.x < x0 || cc.x >= x0 + x1 - cs.x )
{
- int nx, ny;
- nx = cc.x - x1/2; if(nx < 0) nx = 0;
- ny = cc.y - y1/2; if(ny < 0) ny = 0;
- Scroll(nx/dx,ny/dy); // new view start
- x0 = nx; y0 = ny;
- m_ScrollToCursor = false; // avoid recursion
+ nx = cc.x - x1/2;
+ if ( nx < 0 )
+ nx = 0;
+ }
+
+ if ( cc.y < y0 || cc.y >= y0 + y1 - cs.y )
+ {
+ ny = cc.y - y1/2;
+ if ( ny < 0)
+ ny = 0;
+ }
+
+ if ( nx != -1 || ny != -1 )
+ {
+ // set new view start
+ Scroll(nx == -1 ? -1 : (nx+dx-1)/dx, ny == -1 ? -1 : (ny+dy-1)/dy);
+
+ // avoid recursion
+ m_ScrollToCursor = false;
}
}
void
-wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event)) // or: OnDraw(wxDC& dc)
+wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))
{
wxRect region = GetUpdateRegion().GetBox();
- InternalPaint(& region);
+ InternalPaint(®ion);
}
void
wxLayoutWindow::DoPaint(const wxRect *updateRect)
{
-#ifdef __WXGTK__
+#ifndef __WXMSW__
InternalPaint(updateRect);
#else
Refresh(FALSE, updateRect); // Causes bad flicker under wxGTK!!!
+
+ if ( !::UpdateWindow(GetHwnd()) )
+ wxLogLastError("UpdateWindow");
#endif
}
wxPaintDC dc( this );
PrepareDC( dc );
+#ifdef WXLAYOUT_USE_CARET
+ // hide the caret before drawing anything
+ GetCaret()->Hide();
+#endif // WXLAYOUT_USE_CARET
+
int x0,y0,x1,y1, dx, dy;
// Calculate where the top of the visible area is:
// Get the size of the visible window:
GetClientSize(&x1,&y1);
- wxASSERT(x1 > 0);
- wxASSERT(y1 > 0);
- // As we have the values anyway, use them to avoid unnecessary
- // scrollbar updates.
- if(x1 > m_maxx) m_maxx = x1;
- if(y1 > m_maxy) m_maxy = y1;
-
- WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
- updateRect->x, updateRect->y,
- updateRect->x+updateRect->width,
- updateRect->y+updateRect->height));
+ wxASSERT(x1 >= 0);
+ wxASSERT(y1 >= 0);
+ if(updateRect)
+ {
+ WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
+ updateRect->x, updateRect->y,
+ updateRect->x+updateRect->width,
+ updateRect->y+updateRect->height));
+ }
if(IsDirty())
{
m_llist->Layout(dc);
ResizeScrollbars();
}
- /* Check whether the window has grown, if so, we need to reallocate
+ /* Check whether the window has grown, if so, we need to reallocate
the bitmap to be larger. */
if(x1 > m_bitmapSize.x || y1 > m_bitmapSize.y)
{
wxASSERT(m_bitmapSize.x > 0);
wxASSERT(m_bitmapSize.y > 0);
-
+
m_memDC->SelectObject(wxNullBitmap);
delete m_bitmap;
m_bitmapSize = wxPoint(x1,y1);
}
m_memDC->SetDeviceOrigin(0,0);
- m_memDC->SetBrush(wxBrush(m_llist->GetDefaults()->GetBGColour(),wxSOLID));
- m_memDC->SetPen(wxPen(m_llist->GetDefaults()->GetBGColour(),
- 0,wxTRANSPARENT));
+ m_memDC->SetBrush(wxBrush(m_llist->GetDefaultStyleInfo().GetBGColour(),wxSOLID));
+ m_memDC->SetPen(wxPen(m_llist->GetDefaultStyleInfo().GetBGColour(),
+ 0,wxTRANSPARENT));
m_memDC->SetLogicalFunction(wxCOPY);
+ m_memDC->Clear();
- /* Either fill the background with the background bitmap, or clear
- it. */
+ // fill the background with the background bitmap
if(m_BGbitmap)
{
CoordType
m_memDC->DrawBitmap(*m_BGbitmap, x, y);
m_memDC->SetBackgroundMode(wxTRANSPARENT);
}
- else
- {
- // clear the background: (must not be done if we use the update rectangle!)
- m_memDC->SetBackgroundMode(wxSOLID);
- m_memDC->DrawRectangle(0,0,x1, y1);
- }
-
- /* This is the important bit: we tell the list to draw itself: */
+ // This is the important bit: we tell the list to draw itself
#if WXLO_DEBUG_URECT
- WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
- updateRect->x, updateRect->y,
- updateRect->x+updateRect->width,
- updateRect->y+updateRect->height));
+ if(updateRect)
+ {
+ WXLO_DEBUG(("Update rect: %ld,%ld / %ld,%ld",
+ updateRect->x, updateRect->y,
+ updateRect->x+updateRect->width,
+ updateRect->y+updateRect->height));
+ }
#endif
-
+
// Device origins on the memDC are suspect, we translate manually
// with the translate parameter of Draw().
wxPoint offset(-x0+WXLO_XOFFSET,-y0+WXLO_YOFFSET);
// cursor, so that the cursor coordinates get included in the next
// update rectangle (although they are drawn on the memDC, this is
// needed to erase it):
- m_llist->InvalidateUpdateRect();
- m_llist->DrawCursor(*m_memDC,
- m_HaveFocus && IsEditable(), // draw a thick
- // cursor for editable windows with focus
- offset);
+ m_llist->InvalidateUpdateRect();
+ if(m_CursorVisibility != 0)
+ {
+ m_llist->UpdateCursorScreenPos(dc, true, offset);
+ m_llist->DrawCursor(*m_memDC,
+ m_HaveFocus && IsEditable(), // draw a thick
+ // cursor for editable windows with focus
+ offset);
+ }
// Now copy everything to the screen:
#if 0
dc.Blit(x0,y0,x1,y1,m_memDC,0,0,wxCOPY,FALSE);
}
+#ifdef WXLAYOUT_USE_CARET
+ // show the caret back after everything is redrawn
+ m_caret->Show();
+#endif // WXLAYOUT_USE_CARET
+
ResetDirty();
m_ScrollToCursor = false;
+
+ if ( m_StatusBar && m_StatusFieldCursor != -1 )
+ {
+ static wxPoint s_oldCursorPos(-1, -1);
+
+ wxPoint pos(m_llist->GetCursorPos());
+
+ // avoid unnecessary status bar refreshes
+ if ( pos != s_oldCursorPos )
+ {
+ s_oldCursorPos = pos;
+
+ wxString label;
+ label.Printf(_("Ln:%d Col:%d"), pos.y + 1, pos.x + 1);
+ m_StatusBar->SetStatusText(label, m_StatusFieldCursor);
+ }
+ }
}
// change the range and position of scrollbars
{
wxPoint max = m_llist->GetSize();
- WXLO_DEBUG(("ResizeScrollbars: GetSize: %ld, %ld", (long int)max.x,
- (long int) max.y));
- if(max.x > m_maxx || max.y > m_maxy
- || max.x > m_maxx-WXLO_ROFFSET || max.y > m_maxy-WXLO_BOFFSET
- || exact)
+ WXLO_DEBUG(("ResizeScrollbars: max size = (%ld, %ld)",
+ (long int)max.x, (long int) max.y));
+
+ if( max.x > m_maxx - WXLO_ROFFSET || max.y > m_maxy - WXLO_BOFFSET || exact )
{
- if(! exact)
+ if ( !exact )
{
// add an extra bit to the sizes to avoid future updates
- max.x = max.x+WXLO_ROFFSET;
- max.y = max.y+WXLO_BOFFSET;
+ max.x += WXLO_ROFFSET;
+ max.y += WXLO_BOFFSET;
}
+
ViewStart(&m_ViewStartX, &m_ViewStartY);
- SetScrollbars(10, 20, max.x/10+1,max.y/20+1,m_ViewStartX,m_ViewStartY,true);
- m_maxx = max.x; m_maxy = max.y;
+ SetScrollbars(X_SCROLL_PAGE, Y_SCROLL_PAGE,
+ max.x / X_SCROLL_PAGE + 1, max.y / Y_SCROLL_PAGE + 1,
+ m_ViewStartX, m_ViewStartY,
+ true);
+
+ m_maxx = max.x + X_SCROLL_PAGE;
+ m_maxy = max.y + Y_SCROLL_PAGE;
}
}
void
wxLayoutWindow::Paste(void)
{
- wxString text;
// Read some text
if (wxTheClipboard->Open())
{
- wxTextDataObject data;
- if (wxTheClipboard->IsSupported( data.GetFormat() ))
+#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
+ wxLayoutDataObject wxldo;
+ if (wxTheClipboard->IsSupported( wxldo.GetFormat() ))
{
- wxTheClipboard->GetData(&data);
- text += data.GetText();
- }
+ wxTheClipboard->GetData(&wxldo);
+ {
+ }
+ //FIXME: missing functionality m_llist->Insert(wxldo.GetList());
+ }
+ else
+#endif
+ {
+ wxTextDataObject data;
+ if (wxTheClipboard->IsSupported( data.GetFormat() ))
+ {
+ wxTheClipboard->GetData(&data);
+ wxString text = data.GetText();
+ wxLayoutImportText( m_llist, text);
+ }
+ }
wxTheClipboard->Close();
}
+
#if 0
/* My attempt to get the primary selection, but it does not
work. :-( */
text += tmp_tctrl.GetValue();
}
#endif
- wxLayoutImportText( m_llist, text);
}
bool
-wxLayoutWindow::Copy(void)
+wxLayoutWindow::Copy(bool invalidate)
{
// Calling GetSelection() will automatically do an EndSelection()
// on the list, but we need to take a note of it, too:
m_Selecting = false;
m_llist->EndSelection();
}
- wxLayoutList *llist = m_llist->GetSelection();
+
+ wxLayoutDataObject wldo;
+ wxLayoutList *llist = m_llist->GetSelection(&wldo, invalidate);
if(! llist)
return FALSE;
-
+ // Export selection as text:
wxString text;
wxLayoutExportObject *export;
wxLayoutExportStatus status(llist);
else if(len > 1 && text[len-1] == '\n')
text = text.Mid(0,len-1);
}
-
- // Read some text
+
+
if (wxTheClipboard->Open())
{
wxTextDataObject *data = new wxTextDataObject( text );
bool rc = wxTheClipboard->SetData( data );
+#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
+ rc |= wxTheClipboard->AddData( &wldo );
+#endif
wxTheClipboard->Close();
return rc;
}
+
return FALSE;
}
bool
wxLayoutWindow::Cut(void)
{
- if(Copy())
+ if(Copy(false)) // do not invalidate selection after copy
{
m_llist->DeleteSelection();
return TRUE;
wxPoint * fromWhere)
{
wxPoint found;
-
+
if(fromWhere == NULL)
found = m_llist->FindText(needle, m_llist->GetCursorPos());
else
wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
{
m_HaveFocus = true;
-//FIXME: need argument DoPaint(); // to repaint the cursor
+ ev.Skip();
}
void
wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
{
m_HaveFocus = false;
-//FIXME: need argument DoPaint(); // to repaint the cursor
+ ev.Skip();
}
projects / wxWidgets.git / blobdiff