Updated for Mahogany.

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

diff --git a/user/wxLayout/Mpch.h b/user/wxLayout/Mpch.h
new file mode 100644 (file)
index 0000000..c3af536
--- /dev/null
+++ b/user/wxLayout/Mpch.h
@@ -0,0 +1,8 @@
+/*
+  This is an empty Mpch.h file to allow me to move the
+  wxl* files between Mahogany and the wxLayout sample
+  without modifying them.
+*/
+
+static int _mpch_dummy = 0;
+

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index 9a67134f9c80b00bcd5eee96d5b01ea1b03b9540..ecf7e883d9ab88b11cf2d17b9dfc6757b6d845c4 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -14,7 +14,7 @@
 #pragma implementation "wxllist.h"
 #endif
 
 #pragma implementation "wxllist.h"
 #endif
 

-//#include "Mpch.h"
+#include "Mpch.h"

 
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"

diff --git a/user/wxLayout/wxllist.h b/user/wxLayout/wxllist.h
index fd2d2807c674bc16b637dd6d0018ce6db72d8c3f..d758f75a011b375ff727b2a02f4de2901d58c0aa 100644 (file)
--- a/user/wxLayout/wxllist.h
+++ b/user/wxLayout/wxllist.h
@@ -732,6 +732,8 @@ public:
    inline void SetFontUnderline(bool ul) { SetFont(-1,-1,-1,-1,(int)ul); }
    /// set font colours by name
    inline void SetFontColour(char const *fg, char const *bg = NULL) { SetFont(-1,-1,-1,-1,-1,fg,bg); }
    inline void SetFontUnderline(bool ul) { SetFont(-1,-1,-1,-1,(int)ul); }
    /// set font colours by name
    inline void SetFontColour(char const *fg, char const *bg = NULL) { SetFont(-1,-1,-1,-1,-1,fg,bg); }

+   /// set font colours by colour
+   inline void SetFontColour(wxColour *fg, wxColour *bg = NULL) { SetFont(-1,-1,-1,-1,-1,fg,bg); }

    /**
       Returns a pointer to the default settings.
       This is only valid temporarily and should not be stored
    /**
       Returns a pointer to the default settings.
       This is only valid temporarily and should not be stored

diff --git a/user/wxLayout/wxlparser.cpp b/user/wxLayout/wxlparser.cpp
index 5b32988c652a73dbaf6084dba0b7addbf610d8a2..95268ef08c7dd40a65c92028653db2dc33db7a7e 100644 (file)
--- a/user/wxLayout/wxlparser.cpp
+++ b/user/wxLayout/wxlparser.cpp
@@ -10,7 +10,7 @@
 #   pragma implementation "wxlparser.h"
 #endif
 
 #   pragma implementation "wxlparser.h"
 #endif
 

-//#include "Mpch.h"
+#include "Mpch.h"

 #ifdef M_PREFIX
 #   include "gui/wxllist.h"
 #   include "gui/wxlparser.h"
 #ifdef M_PREFIX
 #   include "gui/wxllist.h"
 #   include "gui/wxlparser.h"

diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp
index ac9c213c626ac56dd784a878e65adeb89c9dc2a9..c3571af0db951c6761cf98f6e229c76f88a22d58 100644 (file)
--- a/user/wxLayout/wxlwindow.cpp
+++ b/user/wxLayout/wxlwindow.cpp
@@ -16,7 +16,7 @@
 #endif
 
 
 #endif
 
 

-//#include "Mpch.h"
+#include "Mpch.h"

 #ifdef M_BASEDIR
 #   ifndef USE_PCH
 #     include "Mcommon.h"
 #ifdef M_BASEDIR
 #   ifndef USE_PCH
 #     include "Mcommon.h"


@@ -277,6 +277,9 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       case 'k':
          m_llist->DeleteToEndOfLine();
          break;
       case 'k':
          m_llist->DeleteToEndOfLine();
          break;

+      case 'v':
+         Paste();
+         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


@@ -328,6 +331,10 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
       case WXK_END:
          m_llist->MoveCursorToEndOfLine();
          break;
       case WXK_END:
          m_llist->MoveCursorToEndOfLine();
          break;

+      case WXK_INSERT:
+         if(event.ShiftDown())
+            Paste();
+         break;

       case WXK_DELETE :
          m_llist->Delete(1);
          break;
       case WXK_DELETE :
          m_llist->Delete(1);
          break;