X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/627fe5e8abe4563f794a862a51c6b5f708222d9d..20f2deb3cf287fd2857940cba0d5efbcfc3bb0ad:/samples/richedit/wxlwindow.cpp diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp index acbc6890d8..415ac983ea 100644 --- a/samples/richedit/wxlwindow.cpp +++ b/samples/richedit/wxlwindow.cpp @@ -1,7 +1,7 @@ /*-*- 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$ *******************************************************************/ @@ -18,7 +18,7 @@ # pragma implementation "wxlwindow.h" #endif -#include "wx/wxprec.h" +#include #ifdef __BORLANDC__ # pragma hdrstop @@ -34,6 +34,9 @@ # endif // USE_PCH # include "gui/wxlwindow.h" # include "gui/wxlparser.h" + +# include "MDialogs.h" +# include "strutil.h" #else # ifdef __WXMSW__ # include @@ -57,7 +60,7 @@ // macros // ---------------------------------------------------------------------------- -#ifdef WXLAYOUT_DEBUG +#ifdef DEBUG # define WXLO_DEBUG(x) wxLogDebug x #else # define WXLO_DEBUG(x) @@ -75,6 +78,10 @@ #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; @@ -105,6 +112,8 @@ BEGIN_EVENT_TABLE(wxLayoutWindow,wxScrolledWindow) EVT_SET_FOCUS(wxLayoutWindow::OnSetFocus) EVT_KILL_FOCUS(wxLayoutWindow::OnKillFocus) + +// EVT_IDLE(wxLayoutWindow::ResizeScrollbars) END_EVENT_TABLE() // ---------------------------------------------------------------------------- @@ -118,17 +127,8 @@ static bool IsDirectionKey(long keyCode); // 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 +# define wxWANTS_CHARS 0 #endif // ---------------------------------------------------------------------------- @@ -153,13 +153,11 @@ wxLayoutWindow::wxLayoutWindow(wxWindow *parent) m_bitmap = new wxBitmap(4,4); m_bitmapSize = wxPoint(4,4); m_llist = new wxLayoutList(); -#ifdef __WXMSW__ - SetAutoDeleteSelection(true); -#else - SetAutoDeleteSelection(false); -#endif m_BGbitmap = NULL; m_ScrollToCursor = false; +#ifndef __WXMSW__ + m_FocusFollowMode = false; +#endif SetWrapMargin(0); // no scrollbars initially @@ -173,13 +171,16 @@ wxLayoutWindow::wxLayoutWindow(wxWindow *parent) wxCaret *caret = new wxCaret(this, 2, 20); SetCaret(caret); m_llist->SetCaret(caret); - caret->Show(); #endif // WXLAYOUT_USE_CARET + m_HaveFocus = FALSE; m_HandCursor = FALSE; m_CursorVisibility = -1; SetCursor(wxCURSOR_IBEAM); SetDirty(); + + // at least under Windows, this should be the default behaviour + m_AutoDeleteSelection = TRUE; } wxLayoutWindow::~wxLayoutWindow() @@ -205,17 +206,21 @@ wxLayoutWindow::Clear(int family, wxScrolledWindow::Clear(); ResizeScrollbars(true); SetDirty(); - SetModified(false); - wxScrolledWindow::Clear(); - DoPaint((wxRect *)NULL); + SetModified(FALSE); + if ( m_Editable ) + m_CursorVisibility = 1; + +#ifdef WXLAYOUT_USE_CARET + if ( m_CursorVisibility == 1 ) + GetCaret()->Show(); +#endif // WXLAYOUT_USE_CARET + + RequestUpdate((wxRect *)NULL); } void wxLayoutWindow::Refresh(bool eraseBackground, const wxRect *rect) { wxScrolledWindow::Refresh(eraseBackground, rect); - - ResizeScrollbars(); - ScrollToCursor(); } void @@ -223,11 +228,12 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) { wxClientDC dc( this ); PrepareDC( dc ); - if ( eventId != WXLOWIN_MENU_MOUSEMOVE ) - { - // moving the mouse in a window shouldn't give it the focus! + if ( eventId != WXLOWIN_MENU_MOUSEMOVE +#ifndef __WXMSW__ + || m_FocusFollowMode +#endif + ) SetFocus(); - } wxPoint findPos; findPos.x = dc.DeviceToLogicalX(event.GetX()); @@ -237,12 +243,43 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) 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, @@ -252,120 +289,132 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) // has the mouse only been moved? switch ( eventId ) { - case WXLOWIN_MENU_MOUSEMOVE: - // found is only true if we are really over an object, not just - // behind it - if(found && u && ! m_Selecting) + 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) { - if(!m_HandCursor) - SetCursor(wxCURSOR_HAND); - m_HandCursor = TRUE; - if(m_StatusBar && m_StatusFieldLabel != -1) + const wxString &label = u->GetLabel(); + if(label.Length()) { - const wxString &label = u->GetLabel(); - if(label.Length()) - m_StatusBar->SetStatusText(label, - m_StatusFieldLabel); + m_StatusBar->SetStatusText(label, + m_StatusFieldLabel); + s_hasPutMessageInStatusBar = true; } } - else + } + else + { + if(m_HandCursor) + SetCursor(wxCURSOR_IBEAM); + m_HandCursor = FALSE; + if( m_StatusBar && m_StatusFieldLabel != -1 && + s_hasPutMessageInStatusBar ) { - if(m_HandCursor) - SetCursor(wxCURSOR_IBEAM); - m_HandCursor = FALSE; - if(m_StatusBar && m_StatusFieldLabel != -1) - m_StatusBar->SetStatusText("", m_StatusFieldLabel); + m_StatusBar->SetStatusText("", m_StatusFieldLabel); } + } + } - // selecting? - if ( event.LeftIsDown() ) - { - wxASSERT_MSG( m_Selecting, "should be set in OnMouseLeftDown" ); + // 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! + } + } - m_llist->ContinueSelection(cursorPos, m_ClickPosition); - DoPaint(); // TODO: we don't have to redraw everything! - } + if ( u ) + { + u->DecRef(); + u = NULL; + } + break; - if ( u ) - { - u->DecRef(); - u = NULL; - } - break; + case WXLOWIN_MENU_LDOWN: + { + // always move cursor to mouse click: + m_llist->MoveCursorTo(cursorPos); - 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(); - 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(m_CursorVisibility != 0) - { - // draw a thick cursor for editable windows with focus - m_llist->DrawCursor(dc, m_HaveFocus && IsEditable(), offset); - } + // 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(); +#endif // WXLAYOUT_USE_CARET + + 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; - - case WXLOWIN_MENU_LUP: - if ( m_Selecting ) - { - m_llist->EndSelection(); - m_Selecting = false; + // start selection + m_llist->StartSelection(wxPoint(-1, -1), m_ClickPosition); + m_Selecting = true; + } + break; - DoPaint(); // TODO: we don't have to redraw everything! - } - break; + case WXLOWIN_MENU_LUP: + if ( m_Selecting ) + { + m_llist->EndSelection(); + m_Selecting = false; - case WXLOWIN_MENU_MDOWN: - Paste(TRUE); - break; + RequestUpdate(); // 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(); + case WXLOWIN_MENU_MDOWN: + Paste(TRUE); + break; - 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? @@ -391,8 +440,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event) } } - if( u ) - u->DecRef(); + if( u ) u->DecRef(); } // ---------------------------------------------------------------------------- @@ -415,9 +463,13 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) // Force m_Selecting to be false if shift is no longer // pressed. OnKeyUp() cannot catch all Shift-Up events. - if(!event.ShiftDown()) + if(m_Selecting && !event.ShiftDown()) + { m_Selecting = false; - + m_llist->EndSelection(); + m_llist->DiscardSelection(); //FIXME: correct? + } + // If we deleted the selection here, we must not execute the // deletion in Delete/Backspace handling. bool deletedSelection = false; @@ -431,21 +483,27 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) { m_llist->DeleteSelection(); deletedSelection = true; + SetDirty(); } // + starts selection if ( IsDirectionKey(keyCode) ) { - if ( !m_Selecting ) + // just continue the old selection + if ( m_Selecting ) { - m_Selecting = true; - m_llist->StartSelection(); + if( event.ShiftDown() ) + m_llist->ContinueSelection(); + else + { + m_llist->DiscardSelection(); + m_Selecting = false; + } } - else + else if( event.ShiftDown() ) { - // just continue the old selection - if(! event.ShiftDown() ) - m_llist->DiscardSelection(); + m_Selecting = true; + m_llist->StartSelection(); } } @@ -496,39 +554,78 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) 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(); + break; +#ifdef M_BASEDIR + case 's': // search + Find(""); + break; + case 't': // search again + FindAgain(); + break; +#endif + default: + ; + } else if( IsEditable() ) { /* First, handle control keys */ if(ctrlDown && ! event.AltDown()) { + if(keyCode >= 'A' && keyCode <= 'Z') + keyCode = tolower(keyCode); switch(keyCode) { case WXK_INSERT: Copy(); 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 'u': +#ifdef M_BASEDIR + case 's': // search + Find(""); + break; + case 't': // search again + FindAgain(); + break; +#endif + case 'u': m_llist->DeleteToBeginOfLine(); + SetDirty(); break; case 'k': m_llist->DeleteToEndOfLine(); + SetDirty(); break; case 'v': Paste(); @@ -553,6 +650,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) case WXK_DELETE: case 'd': m_llist->DeleteWord(); + SetDirty(); break; default: ; @@ -572,44 +670,57 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) 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() +//#if 0 + ///FIXME: wxGTK reports MetaDown always + || event.MetaDown() +//#endif + )) && (keyCode < 256 && keyCode >= 32) ) { if(m_WrapMargin > 0 && isspace(keyCode)) m_llist->WrapLine(m_WrapMargin); m_llist->Insert((char)keyCode); + SetDirty(); } break; } } - SetDirty(); - SetModified(); }// if(IsEditable()) }// first switch() @@ -618,14 +729,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) // 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 @@ -644,8 +750,9 @@ wxLayoutWindow::OnKeyUp(wxKeyEvent& event) 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; @@ -659,13 +766,10 @@ wxLayoutWindow::ScrollToCursor(void) // 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()); @@ -689,9 +793,9 @@ wxLayoutWindow::ScrollToCursor(void) { // 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(); } } @@ -703,15 +807,16 @@ wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event)) } void -wxLayoutWindow::DoPaint(const wxRect *updateRect) +wxLayoutWindow::RequestUpdate(const wxRect *updateRect) { #ifdef __WXGTK__ + // Calling Refresh() causes bad flicker under wxGTK!!! InternalPaint(updateRect); -#else // Causes bad flicker under wxGTK!!! +#else + // shouldn't specify the update rectangle if it doesn't include all the + // changed locations - otherwise, they won't be repainted at all because + // the system clips the display to the update rect Refresh(FALSE); //, updateRect); - - if ( !::UpdateWindow(GetHwnd()) ) - wxLogLastError("UpdateWindow"); #endif } @@ -747,9 +852,18 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect) } if(IsDirty()) { + WXLO_DEBUG(("InternalPaint, isdirty, list size: %ld,%ld", + (unsigned long) m_llist->GetSize().x, + (unsigned long) m_llist->GetSize().y)); +// m_llist->ForceTotalLayout(); m_llist->Layout(dc); + WXLO_DEBUG(("InternalPaint, isdirty, list size after layout: %ld,%ld", + (unsigned long) m_llist->GetSize().x, + (unsigned long) m_llist->GetSize().y)); ResizeScrollbars(); + ResetDirty(); } + /* 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) @@ -765,7 +879,7 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect) } m_memDC->SetDeviceOrigin(0,0); - m_memDC->SetBrush(wxBrush(m_llist->GetDefaultStyleInfo().GetBGColour(),wxSOLID)); + m_memDC->SetBackground(wxBrush(m_llist->GetDefaultStyleInfo().GetBGColour(),wxSOLID)); m_memDC->SetPen(wxPen(m_llist->GetDefaultStyleInfo().GetBGColour(), 0,wxTRANSPARENT)); m_memDC->SetLogicalFunction(wxCOPY); @@ -841,11 +955,10 @@ wxLayoutWindow::InternalPaint(const wxRect *updateRect) #ifdef WXLAYOUT_USE_CARET // show the caret back after everything is redrawn - m_caret->Show(); + GetCaret()->Show(); #endif // WXLAYOUT_USE_CARET ResetDirty(); - m_ScrollToCursor = false; if ( m_StatusBar && m_StatusFieldCursor != -1 ) { @@ -869,9 +982,7 @@ void wxLayoutWindow::OnSize(wxSizeEvent &event) { if ( m_llist ) - { ResizeScrollbars(); - } event.Skip(); } @@ -880,6 +991,17 @@ wxLayoutWindow::OnSize(wxSizeEvent &event) void wxLayoutWindow::ResizeScrollbars(bool exact) { + + if(IsDirty()) + { + wxClientDC dc( this ); + PrepareDC( dc ); +// m_llist->ForceTotalLayout(); + m_llist->Layout(dc); + ResetDirty(); + RequestUpdate(); + } + wxPoint max = m_llist->GetSize(); wxSize size = GetClientSize(); @@ -888,9 +1010,9 @@ wxLayoutWindow::ResizeScrollbars(bool exact) // in the absence of scrollbars we should compare with the client size if ( !m_hasHScrollbar ) - m_maxx = size.x - WXLO_ROFFSET; + m_maxx = size.x;// - WXLO_ROFFSET; if ( !m_hasVScrollbar ) - m_maxy = size.y - WXLO_BOFFSET; + m_maxy = size.y;// - WXLO_BOFFSET; // check if the text hasn't become too big // TODO why do we set both at once? they're independent... @@ -917,18 +1039,27 @@ wxLayoutWindow::ResizeScrollbars(bool exact) 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 ( m_hasHScrollbar && (max.x < size.x) ) + if ( !exact ) + { + // add an extra bit to the sizes to avoid future updates + max.x -= WXLO_ROFFSET; + max.y -= WXLO_BOFFSET; + } + + if ( m_hasHScrollbar && (max.x < m_maxx) ) { // remove the horizontal scrollbar SetScrollbars(0, -1, 0, -1, 0, -1, true); m_hasHScrollbar = false; } - if ( m_hasVScrollbar && (max.y < size.y) ) + if ( m_hasVScrollbar && (max.y < m_maxy) ) { // remove the vertical scrollbar SetScrollbars(-1, 0, -1, 0, -1, 0, true); @@ -949,28 +1080,27 @@ wxLayoutWindow::Paste(bool 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() )) { - wxTheClipboard->GetData(&wxldo); - { - } - //FIXME: missing functionality m_llist->Insert(wxldo.GetList()); + wxTheClipboard->GetData(wxldo); + + // now we can access the data we had put into wxLayoutDataObject in + // wxLayoutList::GetSelection by calling its GetLayoutData() - the + // trouble is that I don't know what to do with it! (VZ) } else -#endif { wxTextDataObject data; if (wxTheClipboard->IsSupported( data.GetFormat() )) { - wxTheClipboard->GetData(&data); + wxTheClipboard->GetData(data); wxString text = data.GetText(); wxLayoutImportText( m_llist, text); + SetDirty(); } } wxTheClipboard->Close(); @@ -988,19 +1118,19 @@ wxLayoutWindow::Copy(bool invalidate) 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; @@ -1017,11 +1147,12 @@ wxLayoutWindow::Copy(bool invalidate) if (wxTheClipboard->Open()) { - wxTextDataObject *data = new wxTextDataObject( text ); - bool rc = wxTheClipboard->SetData( data ); -#if wxUSE_PRIVATE_CLIPBOARD_FORMAT - rc |= wxTheClipboard->AddData( &wldo ); -#endif + wxDataObjectComposite *dobj = new wxDataObjectComposite; + dobj->Add(new wxTextDataObject(text)); + dobj->Add(wldo); + + bool rc = wxTheClipboard->SetData(dobj); + wxTheClipboard->Close(); return rc; } @@ -1035,6 +1166,7 @@ wxLayoutWindow::Cut(void) if(Copy(false)) // do not invalidate selection after copy { m_llist->DeleteSelection(); + SetDirty(); return TRUE; } else @@ -1045,16 +1177,31 @@ wxLayoutWindow::Cut(void) // searching // ---------------------------------------------------------------------------- +#ifdef M_BASEDIR bool wxLayoutWindow::Find(const wxString &needle, - wxPoint * fromWhere) + wxPoint * fromWhere, + const wxString &configPath) { 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) @@ -1064,11 +1211,21 @@ wxLayoutWindow::Find(const wxString &needle, } m_llist->MoveCursorTo(found); ScrollToCursor(); + RequestUpdate(); return true; } return false; } + +bool +wxLayoutWindow::FindAgain(void) +{ + bool rc = Find(m_FindString); + return rc; +} +#endif + // ---------------------------------------------------------------------------- // popup menu stuff // ---------------------------------------------------------------------------- @@ -1112,21 +1269,21 @@ void wxLayoutWindow::OnMenu(wxCommandEvent& event) switch (event.GetId()) { case WXLOWIN_MENU_LARGER: - m_llist->SetFontLarger(); Refresh(FALSE); break; + m_llist->SetFontLarger(); RequestUpdate(); break; case WXLOWIN_MENU_SMALLER: - m_llist->SetFontSmaller(); Refresh(FALSE); break; + m_llist->SetFontSmaller(); RequestUpdate(); break; case WXLOWIN_MENU_UNDERLINE: - m_llist->ToggleFontUnderline(); Refresh(FALSE); break; + m_llist->ToggleFontUnderline(); RequestUpdate(); break; case WXLOWIN_MENU_BOLD: - m_llist->ToggleFontWeight(); Refresh(FALSE); break; + m_llist->ToggleFontWeight(); RequestUpdate(); break; case WXLOWIN_MENU_ITALICS: - m_llist->ToggleFontItalics(); Refresh(FALSE); break; + m_llist->ToggleFontItalics(); RequestUpdate(); break; case WXLOWIN_MENU_ROMAN: - m_llist->SetFontFamily(wxROMAN); Refresh(FALSE); break; + m_llist->SetFontFamily(wxROMAN); RequestUpdate(); break; case WXLOWIN_MENU_TYPEWRITER: - m_llist->SetFontFamily(wxFIXED); Refresh(FALSE); break; + m_llist->SetFontFamily(wxFIXED); RequestUpdate(); break; case WXLOWIN_MENU_SANSSERIF: - m_llist->SetFontFamily(wxSWISS); Refresh(FALSE); break; + m_llist->SetFontFamily(wxSWISS); RequestUpdate(); break; } } @@ -1139,6 +1296,7 @@ wxLayoutWindow::OnSetFocus(wxFocusEvent &ev) { m_HaveFocus = true; ev.Skip(); + RequestUpdate(); // cursor must change } void @@ -1146,6 +1304,7 @@ wxLayoutWindow::OnKillFocus(wxFocusEvent &ev) { m_HaveFocus = false; ev.Skip(); + RequestUpdate();// cursor must change } // ----------------------------------------------------------------------------