# pragma implementation "wxlwindow.h"
#endif
-#include "wx/wxprec.h"
+#include <wx/wxprec.h>
#ifdef __BORLANDC__
# pragma hdrstop
// 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
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;
SetWrapMargin(0);
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()
ResizeScrollbars(true);
SetDirty();
SetModified(false);
- wxScrolledWindow::Clear();
+
+ if ( m_Editable )
+ m_CursorVisibility = 1;
+
+#ifdef WXLAYOUT_USE_CARET
+ if ( m_CursorVisibility == 1 )
+ GetCaret()->Show();
+#endif // WXLAYOUT_USE_CARET
+
DoPaint((wxRect *)NULL);
}
wxScrolledWindow::Refresh(eraseBackground, rect);
ResizeScrollbars();
- ScrollToCursor();
+//FIXME is this needed? It causes problems... ScrollToCursor();
}
void
{
wxClientDC dc( this );
PrepareDC( dc );
+#ifdef __WXMSW__
if ( eventId != WXLOWIN_MENU_MOUSEMOVE )
+#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
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)
{
- 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())
- m_StatusBar->SetStatusText(label,
- m_StatusFieldLabel);
+ 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);
+ }
}
- }
- else
- {
- if(m_HandCursor)
- SetCursor(wxCURSOR_IBEAM);
- m_HandCursor = FALSE;
- if(m_StatusBar && m_StatusFieldLabel != -1)
- m_StatusBar->SetStatusText("", m_StatusFieldLabel);
}
// selecting?
if ( event.LeftIsDown() )
{
- wxASSERT_MSG( m_Selecting, "should be set in OnMouseLeftDown" );
-
- m_llist->ContinueSelection(cursorPos, m_ClickPosition);
- DoPaint(); // TODO: we don't have to redraw everything!
+ // 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!
+ }
}
if ( u )
case WXLOWIN_MENU_LDOWN:
{
// always move cursor to mouse click:
- if ( obj )
+// if ( obj )
{
// we have found the real position
m_llist->MoveCursorTo(cursorPos);
}
- else
- {
- // click beyond the end of the text
- m_llist->MoveCursorToEnd();
- }
+// else
+// {
+// // click beyond the end of the text
+// m_llist->MoveCursorToEnd();
+// }
// clicking a mouse removes the selection
if ( m_llist->HasSelection() )
if(m_CursorVisibility == -1)
m_CursorVisibility = 1;
+#ifdef WXLAYOUT_USE_CARET
+ if ( m_CursorVisibility == 1 )
+ GetCaret()->Show();
+#endif // WXLAYOUT_USE_CARET
- if(m_CursorVisibility != 0)
+ if(m_CursorVisibility)
{
- // draw a thick cursor for editable windows with focus
+ // draw a thick cursor for editable windows with focus
m_llist->DrawCursor(dc, m_HaveFocus && IsEditable(), offset);
}
m_llist->StartSelection();
m_llist->MoveCursorWord(1, false);
m_llist->EndSelection();
-
+ m_Selecting = false;
DoPaint(); // TODO: we don't have to redraw everything!
break;
}
}
}
- if( u )
- u->DecRef();
+ if( u ) u->DecRef();
}
// ----------------------------------------------------------------------------
}
#endif
-#if 0
// Force m_Selecting to be false if shift is no longer
// pressed. OnKeyUp() cannot catch all Shift-Up events.
if(m_Selecting && !event.ShiftDown())
m_Selecting = false;
m_llist->EndSelection();
}
-#endif
// If we deleted the selection here, we must not execute the
// deletion in Delete/Backspace handling.
Copy();
break;
case WXK_DELETE :
+ if(! deletedSelection)
+ m_llist->DeleteWord();
+ break;
case 'd':
if(! deletedSelection) // already done
m_llist->Delete(1);
break;
case WXK_TAB:
+ if ( !event.ShiftDown() )
{
// TODO should be configurable
static const int tabSize = 8;
wxLayoutWindow::DoPaint(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
}
m_llist->Layout(dc);
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)
}
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);
#ifdef WXLAYOUT_USE_CARET
// show the caret back after everything is redrawn
- m_caret->Show();
+ GetCaret()->Show();
#endif // WXLAYOUT_USE_CARET
ResetDirty();
// 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...
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);
switch (event.GetId())
{
case WXLOWIN_MENU_LARGER:
- m_llist->SetFontLarger(); Refresh(FALSE); break;
+ m_llist->SetFontLarger(); DoPaint(); break;
case WXLOWIN_MENU_SMALLER:
- m_llist->SetFontSmaller(); Refresh(FALSE); break;
+ m_llist->SetFontSmaller(); DoPaint(); break;
case WXLOWIN_MENU_UNDERLINE:
- m_llist->ToggleFontUnderline(); Refresh(FALSE); break;
+ m_llist->ToggleFontUnderline(); DoPaint(); break;
case WXLOWIN_MENU_BOLD:
- m_llist->ToggleFontWeight(); Refresh(FALSE); break;
+ m_llist->ToggleFontWeight(); DoPaint(); break;
case WXLOWIN_MENU_ITALICS:
- m_llist->ToggleFontItalics(); Refresh(FALSE); break;
+ m_llist->ToggleFontItalics(); DoPaint(); break;
case WXLOWIN_MENU_ROMAN:
- m_llist->SetFontFamily(wxROMAN); Refresh(FALSE); break;
+ m_llist->SetFontFamily(wxROMAN); DoPaint(); break;
case WXLOWIN_MENU_TYPEWRITER:
- m_llist->SetFontFamily(wxFIXED); Refresh(FALSE); break;
+ m_llist->SetFontFamily(wxFIXED); DoPaint(); break;
case WXLOWIN_MENU_SANSSERIF:
- m_llist->SetFontFamily(wxSWISS); Refresh(FALSE); break;
+ m_llist->SetFontFamily(wxSWISS); DoPaint(); break;
}
}
{
m_HaveFocus = true;
ev.Skip();
+ DoPaint(); // cursor must change
}
void
{
m_HaveFocus = false;
ev.Skip();
+ DoPaint();// cursor must change
}
// ----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff