/*-*- 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 (karsten@phy.hw.ac.uk) *
* *
* $Id$
*******************************************************************/
# endif // USE_PCH
# include "gui/wxlwindow.h"
# include "gui/wxlparser.h"
+
+# include "MDialogs.h"
+# include "strutil.h"
#else
# ifdef __WXMSW__
# include <wx/msw/private.h>
// macros
// ----------------------------------------------------------------------------
-#ifdef WXLAYOUT_DEBUG
+#ifdef DEBUG
# define WXLO_DEBUG(x) wxLogDebug x
#else
# define WXLO_DEBUG(x)
#define WXLO_ROFFSET 20
#define WXLO_BOFFSET 20
+/// scroll margins when selecting with the mouse
+#define WXLO_SCROLLMARGIN_X 10
+#define WXLO_SCROLLMARGIN_Y 10
+
/// the size of one scrollbar page in pixels
static const int X_SCROLL_PAGE = 10;
static const int Y_SCROLL_PAGE = 20;
+
+
// ----------------------------------------------------------------------------
// event tables
// ----------------------------------------------------------------------------
EVT_SET_FOCUS(wxLayoutWindow::OnSetFocus)
EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus)
+
+// EVT_IDLE(wxLayoutWindow::ResizeScrollbars)
END_EVENT_TABLE()
// ----------------------------------------------------------------------------
// ============================================================================
#ifndef wxWANTS_CHARS
- #define wxWANTS_CHARS 0
+# define wxWANTS_CHARS 0
#endif
// ----------------------------------------------------------------------------
m_llist = new wxLayoutList();
m_BGbitmap = NULL;
m_ScrollToCursor = false;
+#ifndef __WXMSW__
+ m_FocusFollowMode = false;
+#endif
SetWrapMargin(0);
// no scrollbars initially
wxScrolledWindow::Clear();
ResizeScrollbars(true);
SetDirty();
- SetModified(false);
-
+ SetModified(FALSE);
if ( m_Editable )
m_CursorVisibility = 1;
GetCaret()->Show();
#endif // WXLAYOUT_USE_CARET
- DoPaint((wxRect *)NULL);
+ RequestUpdate((wxRect *)NULL);
}
void wxLayoutWindow::Refresh(bool eraseBackground, const wxRect *rect)
{
wxScrolledWindow::Refresh(eraseBackground, rect);
-
- ResizeScrollbars();
-//FIXME is this needed? It causes problems... ScrollToCursor();
}
void
{
wxClientDC dc( this );
PrepareDC( dc );
-#ifdef __WXMSW__
- if ( eventId != WXLOWIN_MENU_MOUSEMOVE )
+ if ( eventId != WXLOWIN_MENU_MOUSEMOVE
+#ifndef __WXMSW__
+ || m_FocusFollowMode
#endif
- {
- // moving the mouse in a window shouldn't give it the focus!
- // Oh yes! wxGTK's focus handling is so broken, that this is the
- // only sensible way to go.
+ )
SetFocus();
- }
wxPoint findPos;
findPos.x = dc.DeviceToLogicalX(event.GetX());
findPos.y -= WXLO_YOFFSET;
if(findPos.x < 0)
- findPos.x = 0;
+ findPos.x = 0;
if(findPos.y < 0)
- findPos.y = 0;
+ findPos.y = 0;
m_ClickPosition = wxPoint(event.GetX(), event.GetY());
+ // Scroll the window if the mouse is at the end of it:
+ if(m_Selecting && eventId == WXLOWIN_MENU_MOUSEMOVE)
+ {
+ //WXLO_DEBUG(("selecting at : %d/%d", (int) event.GetX(), (int)event.GetY()));
+ int left, top;
+ ViewStart(&left, &top);
+ wxSize size = GetClientSize();
+ int xdelta, ydelta;
+
+ if(event.GetX() < WXLO_SCROLLMARGIN_X)
+ xdelta = -(WXLO_SCROLLMARGIN_X-event.GetX());
+ else if(event.GetX() > size.x-WXLO_SCROLLMARGIN_X)
+ xdelta = event.GetX()-size.x+WXLO_SCROLLMARGIN_X;
+ else
+ xdelta = 0;
+ if(event.GetY() < WXLO_SCROLLMARGIN_Y)
+ ydelta = -(WXLO_SCROLLMARGIN_Y-event.GetY());
+ else if(event.GetY() > size.y-WXLO_SCROLLMARGIN_Y)
+ ydelta = event.GetY()-size.y+WXLO_SCROLLMARGIN_Y;
+ else
+ ydelta = 0;
+
+ //WXLO_DEBUG(("xdelta: %d", (int) xdelta));
+ if(xdelta != 0 || ydelta != 0)
+ {
+ top += ydelta; if(top < 0) top = 0;
+ left += xdelta; if(left < 0) left = 0;
+ Scroll(left, top);
+ }
+ }
+
wxPoint cursorPos;
bool found;
wxLayoutObject *obj = m_llist->FindObjectScreen(dc, findPos,
// has the mouse only been moved?
switch ( eventId )
{
- case WXLOWIN_MENU_MOUSEMOVE:
+ case WXLOWIN_MENU_MOUSEMOVE:
+ {
+ // this variables is used to only erase the message in the status
+ // bar if we had put it there previously - otherwise empting status
+ // bar might be undesirable
+ static bool s_hasPutMessageInStatusBar = false;
+
+ // found is only true if we are really over an object, not just
+ // behind it
+ if(found && u && ! m_Selecting)
+ {
+ if(!m_HandCursor)
+ SetCursor(wxCURSOR_HAND);
+ m_HandCursor = TRUE;
+ if(m_StatusBar && m_StatusFieldLabel != -1)
{
- // this variables is used to only erase the message in the status
- // bar if we had put it there previously - otherwise empting status
- // bar might be undesirable
- static bool s_hasPutMessageInStatusBar = false;
-
- // found is only true if we are really over an object, not just
- // behind it
- if(found && u && ! m_Selecting)
+ const wxString &label = u->GetLabel();
+ if(label.Length())
{
- 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);
- s_hasPutMessageInStatusBar = true;
- }
- }
- }
- else
- {
- if(m_HandCursor)
- SetCursor(wxCURSOR_IBEAM);
- m_HandCursor = FALSE;
- if( m_StatusBar && m_StatusFieldLabel != -1 &&
- s_hasPutMessageInStatusBar )
- {
- m_StatusBar->SetStatusText("", m_StatusFieldLabel);
- }
+ m_StatusBar->SetStatusText(label,
+ m_StatusFieldLabel);
+ s_hasPutMessageInStatusBar = true;
}
}
-
- // selecting?
- if ( event.LeftIsDown() )
+ }
+ else
+ {
+ if(m_HandCursor)
+ SetCursor(wxCURSOR_IBEAM);
+ m_HandCursor = FALSE;
+ if( m_StatusBar && m_StatusFieldLabel != -1 &&
+ s_hasPutMessageInStatusBar )
{
- // m_Selecting might not be set if the button got pressed
- // outside this window, so check for it:
- if( m_Selecting )
- {
- m_llist->ContinueSelection(cursorPos, m_ClickPosition);
- DoPaint(); // TODO: we don't have to redraw everything!
- }
+ m_StatusBar->SetStatusText("", m_StatusFieldLabel);
}
+ }
+ }
- if ( u )
- {
- u->DecRef();
- u = NULL;
- }
- break;
+ // selecting?
+ if ( event.LeftIsDown() )
+ {
+ // m_Selecting might not be set if the button got pressed
+ // outside this window, so check for it:
+ if( m_Selecting )
+ {
+ m_llist->ContinueSelection(cursorPos, m_ClickPosition);
+ RequestUpdate(); // TODO: we don't have to redraw everything!
+ }
+ }
- case WXLOWIN_MENU_LDOWN:
- {
- // always move cursor to mouse click:
-// if ( obj )
- {
- // we have found the real position
- m_llist->MoveCursorTo(cursorPos);
- }
-// else
-// {
-// // click beyond the end of the text
-// m_llist->MoveCursorToEnd();
-// }
-
- // clicking a mouse removes the selection
- if ( m_llist->HasSelection() )
- {
- m_llist->DiscardSelection();
- m_Selecting = false;
- 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);
-
- if(m_CursorVisibility == -1)
- m_CursorVisibility = 1;
+ if ( u )
+ {
+ u->DecRef();
+ u = NULL;
+ }
+ break;
+
+ case WXLOWIN_MENU_LDOWN:
+ {
+ // always move cursor to mouse click:
+ m_llist->MoveCursorTo(cursorPos);
+
+ // clicking a mouse removes the selection
+ if ( m_llist->HasSelection() )
+ {
+ m_llist->DiscardSelection();
+ m_Selecting = false;
+ RequestUpdate(); // 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);
+
+ if(m_CursorVisibility == -1)
+ m_CursorVisibility = 1;
#ifdef WXLAYOUT_USE_CARET
- if ( m_CursorVisibility == 1 )
- GetCaret()->Show();
+ if ( m_CursorVisibility == 1 )
+ GetCaret()->Show();
#endif // WXLAYOUT_USE_CARET
- if(m_CursorVisibility)
- {
- // draw a thick cursor for editable windows with focus
- m_llist->DrawCursor(dc, m_HaveFocus && IsEditable(), offset);
- }
+ if(m_CursorVisibility)
+ {
+ // draw a thick cursor for editable windows with focus
+ m_llist->DrawCursor(dc, m_HaveFocus && IsEditable(), offset);
+ }
#ifdef __WXGTK__
- DoPaint(); // DoPaint suppresses flicker under GTK
+ RequestUpdate(); // RequestUpdate suppresses flicker under GTK
#endif // wxGTK
- // start selection
- m_llist->StartSelection(wxPoint(-1, -1), m_ClickPosition);
- m_Selecting = true;
- }
- break;
+ // start selection
+ m_llist->StartSelection(wxPoint(-1, -1), m_ClickPosition);
+ m_Selecting = true;
+ }
+ break;
- case WXLOWIN_MENU_LUP:
- if ( m_Selecting )
- {
- m_llist->EndSelection();
- m_Selecting = false;
+ case WXLOWIN_MENU_LUP:
+ if ( m_Selecting )
+ {
+ // end selection at the cursor position corresponding to the
+ // current mouse position, but don´t move cursor there.
+ m_llist->EndSelection(cursorPos,m_ClickPosition);
+ m_Selecting = false;
- DoPaint(); // TODO: we don't have to redraw everything!
- }
- break;
+ RequestUpdate(); // TODO: we don't have to redraw everything!
+ }
+ break;
- case WXLOWIN_MENU_MDOWN:
- Paste(TRUE);
- break;
+ case WXLOWIN_MENU_MDOWN:
+ Paste(TRUE);
+ break;
- case WXLOWIN_MENU_DBLCLICK:
- // select a word under cursor
- m_llist->MoveCursorTo(cursorPos);
- m_llist->MoveCursorWord(-1);
- m_llist->StartSelection();
- m_llist->MoveCursorWord(1, false);
- m_llist->EndSelection();
- m_Selecting = false;
- DoPaint(); // TODO: we don't have to redraw everything!
- break;
+ case WXLOWIN_MENU_DBLCLICK:
+ // select a word under cursor
+ m_llist->MoveCursorTo(cursorPos);
+ m_llist->MoveCursorWord(-1);
+ m_llist->StartSelection();
+ m_llist->MoveCursorWord(1, false);
+ m_llist->EndSelection();
+ m_Selecting = false;
+ RequestUpdate(); // TODO: we don't have to redraw everything!
+ break;
}
// notify about mouse events?
{
m_Selecting = false;
m_llist->EndSelection();
+ m_llist->DiscardSelection(); //FIXME: correct?
}
// If we deleted the selection here, we must not execute the
{
m_llist->DeleteSelection();
deletedSelection = true;
+ SetDirty();
}
// <Shift>+<arrow> starts selection
if ( IsDirectionKey(keyCode) )
{
- if ( m_Selecting )
+ // just continue the old selection
+ if ( m_Selecting && event.ShiftDown() )
+ m_llist->ContinueSelection();
+ else
{
- // just continue the old selection
+ m_llist->DiscardSelection();
+ m_Selecting = false;
if( event.ShiftDown() )
- m_llist->ContinueSelection();
- else
{
- m_llist->DiscardSelection();
- m_Selecting = false;
+ m_Selecting = true;
+ m_llist->StartSelection();
}
}
- else if( event.ShiftDown() )
- {
- m_Selecting = true;
- m_llist->StartSelection();
- }
-
}
// If needed, make cursor visible:
else
m_llist->MoveCursorToEndOfLine();
break;
-
default:
- if(keyCode == 'c' && ctrlDown)
- {
- // this should work even in read-only mode
- Copy();
- }
+
+ if(ctrlDown && ! IsEditable())
+ switch(keyCode)
+ {
+ case 'c':
+ // this should work even in read-only mode
+ Copy(TRUE, TRUE);
+ break;
+ case 's': // search
+ Find("");
+ break;
+ case 't': // search again
+ FindAgain();
+ break;
+ default:
+ // we don't handle it, maybe an accelerator?
+ event.Skip();
+ ;
+ }
else if( IsEditable() )
{
/* First, handle control keys */
if(ctrlDown && ! event.AltDown())
{
+ if(keyCode >= 'A' && keyCode <= 'Z')
+ keyCode = tolower(keyCode);
switch(keyCode)
{
case WXK_INSERT:
break;
case WXK_DELETE :
if(! deletedSelection)
+ {
m_llist->DeleteWord();
+ SetDirty();
+ }
break;
case 'd':
if(! deletedSelection) // already done
+ {
m_llist->Delete(1);
+ SetDirty();
+ }
break;
case 'y':
m_llist->DeleteLines(1);
+ SetDirty();
break;
case 'h': // like backspace
- if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);
+ if(m_llist->MoveCursorHorizontally(-1))
+ {
+ m_llist->Delete(1);
+ SetDirty();
+ }
+ break;
+ case 's': // search
+ Find("");
+ break;
+ case 't': // search again
+ FindAgain();
break;
case 'u':
m_llist->DeleteToBeginOfLine();
+ SetDirty();
break;
case 'k':
m_llist->DeleteToEndOfLine();
+ SetDirty();
+ break;
+ case 'c':
+ Copy(TRUE, TRUE);
break;
case 'v':
- Paste();
+ Paste( TRUE );
break;
case 'x':
Cut();
break;
#endif
default:
- ;
+ // we don't handle it, maybe an accelerator?
+ event.Skip();
}
}
// ALT only:
case WXK_DELETE:
case 'd':
m_llist->DeleteWord();
+ SetDirty();
break;
default:
- ;
+ // we don't handle it, maybe an accelerator?
+ event.Skip();
}
}
// no control keys:
Cut();
else
if(! deletedSelection)
+ {
m_llist->Delete(1);
+ SetDirty();
+ }
break;
case WXK_BACK: // backspace
if(! deletedSelection)
if(m_llist->MoveCursorHorizontally(-1))
+ {
m_llist->Delete(1);
+ SetDirty();
+ }
break;
case WXK_RETURN:
if(m_WrapMargin > 0)
m_llist->WrapLine(m_WrapMargin);
m_llist->LineBreak();
+ SetDirty();
break;
case WXK_TAB:
if ( !event.ShiftDown() )
{
- // TODO should be configurable
- static const int tabSize = 8;
+ // TODO should be configurable
+ static const int tabSize = 8;
- CoordType x = m_llist->GetCursorPos().x;
- size_t numSpaces = tabSize - x % tabSize;
- m_llist->Insert(wxString(' ', numSpaces));
+ CoordType x = m_llist->GetCursorPos().x;
+ size_t numSpaces = tabSize - x % tabSize;
+ m_llist->Insert(wxString(' ', numSpaces));
+ SetDirty();
}
break;
default:
- if((!(event.ControlDown() || event.AltDown() || event.MetaDown()))
+ if((!(event.ControlDown() || event.AltDown()
+ ))
&& (keyCode < 256 && keyCode >= 32)
)
{
if(m_WrapMargin > 0 && isspace(keyCode))
- m_llist->WrapLine(m_WrapMargin);
- m_llist->Insert((char)keyCode);
+ {
+ bool wrapped = m_llist->WrapLine(m_WrapMargin);
+ // don´t insert space as first thing in line
+ // after wrapping:
+ if(! wrapped || m_llist->GetCursorPos().x != 0)
+ m_llist->Insert((char)keyCode);
+ }
+ else
+ m_llist->Insert((char)keyCode);
+ SetDirty();
}
+ else
+ // we don't handle it, maybe an accelerator?
+ event.Skip();
break;
}
}
- SetDirty();
- SetModified();
}// if(IsEditable())
+ else
+ // we don't handle it, maybe an accelerator?
+ event.Skip();
}// first switch()
if ( m_Selecting )
// continue selection to the current (new) cursor position
m_llist->ContinueSelection();
}
-
- // we must call ResizeScrollbars() before ScrollToCursor(), otherwise the
- // ne cursor position might be outside the current scrolllbar range
- ResizeScrollbars();
ScrollToCursor();
-
// refresh the screen
- DoPaint(m_llist->GetUpdateRect());
+ RequestUpdate(m_llist->GetUpdateRect());
}
void
void
wxLayoutWindow::ScrollToCursor(void)
{
- wxClientDC dc( this );
- PrepareDC( dc );
+ //is always needed to make sure we know where the cursor is
+ //if(IsDirty())
+ RequestUpdate(m_llist->GetUpdateRect());
int x0,y0,x1,y1, dx, dy;
// Get the size of the visible window:
GetClientSize(&x1, &y1);
- // update the cursor screen position
- m_llist->Layout(dc);
-
// 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(dc);
+ wxPoint cc = m_llist->GetCursorScreenPos();
// the cursor should be completely visible in both directions
wxPoint cs(m_llist->GetCursorSize());
{
// set new view start
Scroll(nx == -1 ? -1 : (nx+dx-1)/dx, ny == -1 ? -1 : (ny+dy-1)/dy);
-
// avoid recursion
m_ScrollToCursor = false;
+ RequestUpdate();
}
}
}
void
-wxLayoutWindow::DoPaint(const wxRect *updateRect)
+wxLayoutWindow::RequestUpdate(const wxRect *updateRect)
{
#ifdef __WXGTK__
// Calling Refresh() causes bad flicker under wxGTK!!!
updateRect->x+updateRect->width,
updateRect->y+updateRect->height));
}
- if(IsDirty())
- {
- m_llist->Layout(dc);
- ResizeScrollbars();
- }
+ ResizeScrollbars();
+
+
/* 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)
#endif // WXLAYOUT_USE_CARET
ResetDirty();
- m_ScrollToCursor = false;
if ( m_StatusBar && m_StatusFieldCursor != -1 )
{
wxLayoutWindow::OnSize(wxSizeEvent &event)
{
if ( m_llist )
- {
ResizeScrollbars();
- }
event.Skip();
}
-// change the range and position of scrollbars
+/*
+Change the range and position of scrollbars. Has evolved into a
+generic Update function which will at some time later cause a repaint
+as needed.
+*/
+
void
wxLayoutWindow::ResizeScrollbars(bool exact)
{
+
+ if(! IsDirty())
+ return;
+
+ wxClientDC dc( this );
+ PrepareDC( dc );
+// m_llist->ForceTotalLayout();
+ m_llist->Layout(dc);
+ ResetDirty();
+
wxPoint max = m_llist->GetSize();
wxSize size = GetClientSize();
// check if the text hasn't become too big
// TODO why do we set both at once? they're independent...
- if( max.x > m_maxx - WXLO_ROFFSET || max.y > m_maxy - WXLO_BOFFSET || exact )
+ if( max.x > m_maxx - WXLO_ROFFSET
+ || max.y > m_maxy - WXLO_BOFFSET
+ || max.x < m_maxx - X_SCROLL_PAGE
+ || max.y < m_maxy - Y_SCROLL_PAGE
+ || exact )
{
// text became too large
if ( !exact )
max.y += WXLO_BOFFSET;
}
- ViewStart(&m_ViewStartX, &m_ViewStartY);
- 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_hasHScrollbar =
- m_hasVScrollbar = true;
-
- m_maxx = max.x + X_SCROLL_PAGE;
- m_maxy = max.y + Y_SCROLL_PAGE;
- }
-#if 0
- //FIXME: this code is pretty broken, producing "arithmetic
- //exception" crashes (div by 0??)
- else
- {
- // check if the window hasn't become too big, thus making the scrollbars
- // unnecessary
- if ( !exact )
+ bool done = FALSE;
+ if(max.x < X_SCROLL_PAGE)
{
- // add an extra bit to the sizes to avoid future updates
- max.x -= WXLO_ROFFSET;
- max.y -= WXLO_BOFFSET;
+ SetScrollbars(0,-1,0,-1,0,-1,true);
+ m_hasHScrollbar = FALSE;
+ done = TRUE;
}
-
- if ( m_hasHScrollbar && (max.x < m_maxx) )
+ if(max.y < Y_SCROLL_PAGE)
{
- // remove the horizontal scrollbar
- SetScrollbars(0, -1, 0, -1, 0, -1, true);
- m_hasHScrollbar = false;
+ SetScrollbars(-1,0,-1,0,-1,0,true);
+ m_hasVScrollbar = FALSE;
+ done = TRUE;
}
-
- if ( m_hasVScrollbar && (max.y < m_maxy) )
+ if(! done)
{
- // remove the vertical scrollbar
- SetScrollbars(-1, 0, -1, 0, -1, 0, true);
- m_hasVScrollbar = false;
+ ViewStart(&m_ViewStartX, &m_ViewStartY);
+ 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_hasHScrollbar =
+ m_hasVScrollbar = true;
}
+
+ m_maxx = max.x + X_SCROLL_PAGE;
+ m_maxy = max.y + Y_SCROLL_PAGE;
}
-#endif
}
// ----------------------------------------------------------------------------
+//
// clipboard operations
//
// ----------------------------------------------------------------------------
void
-wxLayoutWindow::Paste(bool primary)
+wxLayoutWindow::Paste(bool usePrivate, bool primary)
{
+ // this only has an effect under X11:
+ wxTheClipboard->UsePrimarySelection(primary);
// Read some text
if (wxTheClipboard->Open())
{
-#if __WXGTK__
- if(primary)
- wxTheClipboard->UsePrimarySelection();
-#endif
-#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
- wxLayoutDataObject wxldo;
- if (wxTheClipboard->IsSupported( wxldo.GetFormat() ))
+ if(usePrivate)
{
- wxTheClipboard->GetData(&wxldo);
+ wxLayoutDataObject wxldo;
+ if (wxTheClipboard->IsSupported( wxldo.GetFormat() ))
{
+ if(wxTheClipboard->GetData(wxldo))
+ {
+ wxTheClipboard->Close();
+ wxString str = wxldo.GetLayoutData();
+ m_llist->Read(str);
+ SetDirty();
+ RequestUpdate();
+ return;
+ }
}
- //FIXME: missing functionality m_llist->Insert(wxldo.GetList());
}
- else
-#endif
+ wxTextDataObject data;
+ if (wxTheClipboard->IsSupported( data.GetFormat() )
+ && wxTheClipboard->GetData(data) )
+ {
+ wxTheClipboard->Close();
+ wxString text = data.GetText();
+ wxLayoutImportText( m_llist, text);
+ SetDirty();
+ RequestUpdate();
+ return;
+ }
+ }
+ // if everything failed we can still try the primary:
+ wxTheClipboard->Close();
+ if(! primary) // not tried before
+ {
+ wxTheClipboard->UsePrimarySelection();
+ if (wxTheClipboard->Open())
{
wxTextDataObject data;
- if (wxTheClipboard->IsSupported( data.GetFormat() ))
+ if (wxTheClipboard->IsSupported( data.GetFormat() )
+ && wxTheClipboard->GetData(data) )
{
- wxTheClipboard->GetData(&data);
wxString text = data.GetText();
wxLayoutImportText( m_llist, text);
+ SetDirty();
+ RequestUpdate();
}
+ wxTheClipboard->Close();
}
- wxTheClipboard->Close();
}
}
bool
-wxLayoutWindow::Copy(bool invalidate)
+wxLayoutWindow::Copy(bool invalidate, bool privateFormat, bool primary)
{
// Calling GetSelection() will automatically do an EndSelection()
// on the list, but we need to take a note of it, too:
m_llist->EndSelection();
}
- wxLayoutDataObject wldo;
- wxLayoutList *llist = m_llist->GetSelection(&wldo, invalidate);
+ wxLayoutDataObject *wldo = new wxLayoutDataObject;
+ wxLayoutList *llist = m_llist->GetSelection(wldo, invalidate);
if(! llist)
return FALSE;
// Export selection as text:
wxString text;
- wxLayoutExportObject *export;
+ wxLayoutExportObject *exp;
wxLayoutExportStatus status(llist);
- while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
+ while((exp = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
{
- if(export->type == WXLO_EXPORT_TEXT)
- text << *(export->content.text);
- delete export;
+ if(exp->type == WXLO_EXPORT_TEXT)
+ text << *(exp->content.text);
+ delete exp;
}
delete llist;
text = text.Mid(0,len-1);
}
+#if 0
+if(! primary) // always copy as text-only to primary selection
+ {
+ wxTheClipboard->UsePrimarySelection();
+ if (wxTheClipboard->Open())
+ {
+ wxTextDataObject *data = new wxTextDataObject( text );
+ wxTheClipboard->SetData( data );
+ wxTheClipboard->Close();
+ }
+ }
+#endif
+ wxTheClipboard->UsePrimarySelection(primary);
if (wxTheClipboard->Open())
{
wxTextDataObject *data = new wxTextDataObject( text );
- bool rc = wxTheClipboard->SetData( data );
-#if wxUSE_PRIVATE_CLIPBOARD_FORMAT
- rc |= wxTheClipboard->AddData( &wldo );
-#endif
+ bool rc;
+
+ rc = wxTheClipboard->SetData( data );
+ if(privateFormat)
+ rc |= wxTheClipboard->SetData( wldo );
wxTheClipboard->Close();
return rc;
}
-
+ else
+ delete wldo;
+
return FALSE;
}
bool
-wxLayoutWindow::Cut(void)
+wxLayoutWindow::Cut(bool privateFormat, bool usePrimary)
{
- if(Copy(false)) // do not invalidate selection after copy
+ if(Copy(false, privateFormat, usePrimary)) // do not invalidate selection after copy
{
m_llist->DeleteSelection();
+ SetDirty();
return TRUE;
}
else
bool
wxLayoutWindow::Find(const wxString &needle,
- wxPoint * fromWhere)
+ wxPoint * fromWhere,
+ const wxString &configPath)
{
+#ifdef M_BASEDIR
wxPoint found;
-
+
+ if(needle.Length() == 0)
+ {
+ if( ! MInputBox(&m_FindString,
+ _("Find text"),
+ _(" Find:"),
+ this,
+ configPath, "")
+ || strutil_isempty(m_FindString))
+ return true;
+ }
+ else
+ m_FindString = needle;
+
if(fromWhere == NULL)
- found = m_llist->FindText(needle, m_llist->GetCursorPos());
+ found = m_llist->FindText(m_FindString, m_llist->GetCursorPos());
else
- found = m_llist->FindText(needle, *fromWhere);
+ found = m_llist->FindText(m_FindString, *fromWhere);
if(found.x != -1)
{
if(fromWhere)
}
m_llist->MoveCursorTo(found);
ScrollToCursor();
+ RequestUpdate();
return true;
}
+#endif
return false;
}
+
+bool
+wxLayoutWindow::FindAgain(void)
+{
+ bool rc = Find(m_FindString);
+ return rc;
+}
+
// ----------------------------------------------------------------------------
// popup menu stuff
// ----------------------------------------------------------------------------
switch (event.GetId())
{
case WXLOWIN_MENU_LARGER:
- m_llist->SetFontLarger(); DoPaint(); break;
+ m_llist->SetFontLarger(); RequestUpdate(); break;
case WXLOWIN_MENU_SMALLER:
- m_llist->SetFontSmaller(); DoPaint(); break;
+ m_llist->SetFontSmaller(); RequestUpdate(); break;
case WXLOWIN_MENU_UNDERLINE:
- m_llist->ToggleFontUnderline(); DoPaint(); break;
+ m_llist->ToggleFontUnderline(); RequestUpdate(); break;
case WXLOWIN_MENU_BOLD:
- m_llist->ToggleFontWeight(); DoPaint(); break;
+ m_llist->ToggleFontWeight(); RequestUpdate(); break;
case WXLOWIN_MENU_ITALICS:
- m_llist->ToggleFontItalics(); DoPaint(); break;
+ m_llist->ToggleFontItalics(); RequestUpdate(); break;
case WXLOWIN_MENU_ROMAN:
- m_llist->SetFontFamily(wxROMAN); DoPaint(); break;
+ m_llist->SetFontFamily(wxROMAN); RequestUpdate(); break;
case WXLOWIN_MENU_TYPEWRITER:
- m_llist->SetFontFamily(wxFIXED); DoPaint(); break;
+ m_llist->SetFontFamily(wxFIXED); RequestUpdate(); break;
case WXLOWIN_MENU_SANSSERIF:
- m_llist->SetFontFamily(wxSWISS); DoPaint(); break;
+ m_llist->SetFontFamily(wxSWISS); RequestUpdate(); break;
}
}
{
m_HaveFocus = true;
ev.Skip();
- DoPaint(); // cursor must change
+ RequestUpdate(); // cursor must change
}
void
{
m_HaveFocus = false;
ev.Skip();
- DoPaint();// cursor must change
+ RequestUpdate();// cursor must change
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff