Updated for Mahogany.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
8
user/wxLayout/Mpch.h
Normal file
8
user/wxLayout/Mpch.h
Normal file
@@ -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;
|
||||
|
@@ -14,7 +14,7 @@
|
||||
#pragma implementation "wxllist.h"
|
||||
#endif
|
||||
|
||||
//#include "Mpch.h"
|
||||
#include "Mpch.h"
|
||||
|
||||
|
||||
#include "wx/wxprec.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); }
|
||||
/// 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
|
||||
|
@@ -10,7 +10,7 @@
|
||||
# pragma implementation "wxlparser.h"
|
||||
#endif
|
||||
|
||||
//#include "Mpch.h"
|
||||
#include "Mpch.h"
|
||||
#ifdef M_PREFIX
|
||||
# include "gui/wxllist.h"
|
||||
# include "gui/wxlparser.h"
|
||||
|
@@ -16,7 +16,7 @@
|
||||
#endif
|
||||
|
||||
|
||||
//#include "Mpch.h"
|
||||
#include "Mpch.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 'v':
|
||||
Paste();
|
||||
break;
|
||||
#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_INSERT:
|
||||
if(event.ShiftDown())
|
||||
Paste();
|
||||
break;
|
||||
case WXK_DELETE :
|
||||
m_llist->Delete(1);
|
||||
break;
|
||||
|
Reference in New Issue
Block a user