updated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/user/wxLayout/TODO b/user/wxLayout/TODO
index 6d3df47b67b558b4455ad277b9e3716d2aef4d9b..b54081413bb7df0becee933ed1cdcac3466c1e3e 100644 (file)
--- a/user/wxLayout/TODO
+++ b/user/wxLayout/TODO
@@ -21,6 +21,9 @@ TODO
   - selection highlighting is a bit broken
 Improve speed! (See layout problem below!)
 
   - selection highlighting is a bit broken
 Improve speed! (See layout problem below!)
 

+  - wxlwindow needs to shrink scrollbar range when window contents get removed
+  - When selecting with the mouse, scroll window if pointer is outside.
+

 The following two probs can probably be fixed by adding the
 RecalculateLayout() method:
 Funny re-layout shows again in sample text.
 The following two probs can probably be fixed by adding the
 RecalculateLayout() method:
 Funny re-layout shows again in sample text.

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index a0248d4ce1c9d8b18bdf4c970541323e87d4f388..caf366bcb2ef3ec43be2005a3477ebfbcce76a65 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -228,8 +228,8 @@ wxLayoutObjectText::Draw(wxDC &dc, wxPoint const &coords,
       long width, height, descent;
 
       if(begin < 0) begin = 0;
       long width, height, descent;
 
       if(begin < 0) begin = 0;

-      if(end > m_Text.Length()) end = m_Text.Length();
-      
+      if( end > (signed)m_Text.Length() )
+         end = m_Text.Length();

       
       str = m_Text.Mid(0, begin);
       dc.DrawText(str, xpos, ypos);
       
       str = m_Text.Mid(0, begin);
       dc.DrawText(str, xpos, ypos);

diff --git a/user/wxLayout/wxllist.h b/user/wxLayout/wxllist.h
index 267447465ad477f727b12d6b5897c77854b1dcb0..84a1e1c7c647807e9bb9ac34e01ce1a3ab1b047e 100644 (file)
--- a/user/wxLayout/wxllist.h
+++ b/user/wxLayout/wxllist.h
@@ -1058,7 +1058,7 @@ public:
    wxLayoutDataObject(void)
       {
          SetId("application/wxlayoutlist");
    wxLayoutDataObject(void)
       {
          SetId("application/wxlayoutlist");

-         m_format.SetAtom((GdkAtom) 222222);
+         //m_format.SetAtom((GdkAtom) 222222);

       }
 };
 
       }
 };
 

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index 80d47b9f80f22cdec0c321fc73341c77876b87e0..4331bd51bf823775298ccaa71ac4adaaa3cbef4f 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -168,7 +168,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
    {
       // found is only true if we are really over an object, not just
       // behind it
    {
       // found is only true if we are really over an object, not just
       // behind it

-      if(found && u)
+      if(found && u && ! m_Selecting)

       {
          if(!m_HandCursor)
             SetCursor(wxCURSOR_HAND);
       {
          if(!m_HandCursor)
             SetCursor(wxCURSOR_HAND);


@@ -331,6 +331,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
          {
             switch(keyCode)
             {
          {
             switch(keyCode)
             {

+            case WXK_INSERT:
+               Copy();
+               break;

             case WXK_DELETE :
             case 'd':
                m_llist->Delete(1);
             case WXK_DELETE :
             case 'd':
                m_llist->Delete(1);


@@ -350,6 +353,12 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
             case 'v':
                Paste();
                break;
             case 'v':
                Paste();
                break;

+            case 'c':
+               Copy();
+               break;
+            case 'x':
+               Cut();
+               break;

 #ifdef WXLAYOUT_DEBUG
             case WXK_F1:
                m_llist->SetFont(-1,-1,-1,-1,true);  // underlined
 #ifdef WXLAYOUT_DEBUG
             case WXK_F1:
                m_llist->SetFont(-1,-1,-1,-1,true);  // underlined


@@ -382,7 +391,10 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
                   Paste();
                break;
             case WXK_DELETE :
                   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);
                break;
             case WXK_BACK: // backspace
                if(m_llist->MoveCursorHorizontally(-1)) m_llist->Delete(1);

diff --git a/user/wxLayout/wxlwindow.h b/user/wxLayout/wxlwindow.h
index ead3310cf7147b2587ac31a551dee4f5898353c0..881dc66e65c1f40098f6a7787f4bfcd7dc66e0ee 100644 (file)
--- a/user/wxLayout/wxlwindow.h
+++ b/user/wxLayout/wxlwindow.h
@@ -169,7 +169,7 @@ public:
        @param labelfield field to use in statusbar for URLs/userdata labels, or -1 to disable
        @param cursorfield field to use for cursor position, or -1 to disable
    */
        @param labelfield field to use in statusbar for URLs/userdata labels, or -1 to disable
        @param cursorfield field to use for cursor position, or -1 to disable
    */

-   inline SetStatusBar(class wxStatusBar *bar,
+   void SetStatusBar(class wxStatusBar *bar,

                        int labelfield = -1,
                        int cursorfield = -1)
       {
                        int labelfield = -1,
                        int cursorfield = -1)
       {