X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dafc583198469706ba195f9da26aad1130fb3872..b4a2ab728bf4627ab2b41385b69e31f10c1fd3b1:/samples/richedit/wxlwindow.cpp

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index f25d30b5fb..63ce2369cf 100644
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -118,15 +118,6 @@ 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
 #endif
@@ -177,11 +168,7 @@ wxLayoutWindow::wxLayoutWindow(wxWindow *parent)
    SetDirty();
 
    // at least under Windows, this should be the default behaviour
-#ifdef __WXMSW__
    m_AutoDeleteSelection = TRUE;
-#else // !Windows
-   m_AutoDeleteSelection = FALSE;
-#endif // Win/!Win
 }
 
 wxLayoutWindow::~wxLayoutWindow()
@@ -209,6 +196,9 @@ wxLayoutWindow::Clear(int family,
    SetDirty();
    SetModified(false);
 
+   if ( m_Editable )
+      m_CursorVisibility = 1;
+
 #ifdef WXLAYOUT_USE_CARET
    if ( m_CursorVisibility == 1 )
       GetCaret()->Show();
@@ -222,7 +212,7 @@ void wxLayoutWindow::Refresh(bool eraseBackground, const wxRect *rect)
    wxScrolledWindow::Refresh(eraseBackground, rect);
 
    ResizeScrollbars();
-   ScrollToCursor();
+//FIXME is this needed? It causes problems...   ScrollToCursor();
 }
 
 void
@@ -230,7 +220,9 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 {
    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 
@@ -262,28 +254,41 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    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?
@@ -291,7 +296,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
          {
             // m_Selecting might not be set if the button got pressed
             // outside this window, so check for it:
-            if(m_Selecting)
+            if( m_Selecting )
             {
                m_llist->ContinueSelection(cursorPos, m_ClickPosition);
                DoPaint();  // TODO: we don't have to redraw everything!
@@ -308,16 +313,16 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
       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() )
@@ -338,8 +343,12 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
 
              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
                 m_llist->DrawCursor(dc, m_HaveFocus && IsEditable(), offset);
@@ -376,7 +385,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
          m_llist->StartSelection();
          m_llist->MoveCursorWord(1, false);
          m_llist->EndSelection();
-
+         m_Selecting = false;
          DoPaint();     // TODO: we don't have to redraw everything!
          break;
    }
@@ -404,8 +413,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
       }
    }
 
-   if( u )
-      u->DecRef();
+   if( u ) u->DecRef();
 }
 
 // ----------------------------------------------------------------------------
@@ -426,7 +434,6 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
    }
 #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())
@@ -434,7 +441,6 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       m_Selecting = false;
       m_llist->EndSelection();
    }
-#endif
    
    // If we deleted the selection here, we must not execute the
    // deletion in Delete/Backspace handling.
@@ -538,6 +544,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                Copy();
                break;
             case WXK_DELETE :
+               if(! deletedSelection)
+                  m_llist->DeleteWord();
+               break;
             case 'd':
                if(! deletedSelection) // already done
                   m_llist->Delete(1);
@@ -610,6 +619,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                break;
 
             case WXK_TAB:
+               if ( !event.ShiftDown() )
                {
                    // TODO should be configurable
                    static const int tabSize = 8;
@@ -914,9 +924,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...
@@ -943,18 +953,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);
@@ -1138,21 +1157,21 @@ void wxLayoutWindow::OnMenu(wxCommandEvent& event)
    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;
    }
 }
 
@@ -1165,6 +1184,7 @@ wxLayoutWindow::OnSetFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = true;
    ev.Skip();
+   DoPaint(); // cursor must change
 }
 
 void
@@ -1172,6 +1192,7 @@ wxLayoutWindow::OnKillFocus(wxFocusEvent &ev)
 {
    m_HaveFocus = false;
    ev.Skip();
+   DoPaint();// cursor must change
 }
 
 // ----------------------------------------------------------------------------