projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed DoInit() straggler from appbase mods.
[wxWidgets.git]
/
src
/
msw
/
textctrl.cpp
diff --git
a/src/msw/textctrl.cpp
b/src/msw/textctrl.cpp
index 978fb173ce1f4e4d46422f5319833ec8512ed779..6e285fabad1faacd4bd0c1f5ebf0b4db2db4c652 100644
(file)
--- a/
src/msw/textctrl.cpp
+++ b/
src/msw/textctrl.cpp
@@
-553,6
+553,15
@@
DWORD CALLBACK wxRichEditStreamIn(DWORD dwCookie, BYTE *buf, LONG cb, LONG *pcb)
extern long wxEncodingToCodepage(wxFontEncoding encoding); // from utils.cpp
extern long wxEncodingToCodepage(wxFontEncoding encoding); // from utils.cpp
+#ifdef __WXWINE__
+bool wxTextCtrl::StreamIn(const wxString& value,
+ wxFontEncoding WXUNUSED(encoding),
+ bool selectionOnly)
+{
+ return FALSE;
+}
+#else
+
#if wxUSE_UNICODE_MSLU
bool wxTextCtrl::StreamIn(const wxString& value,
wxFontEncoding WXUNUSED(encoding),
#if wxUSE_UNICODE_MSLU
bool wxTextCtrl::StreamIn(const wxString& value,
wxFontEncoding WXUNUSED(encoding),
@@
-617,6
+626,9
@@
bool wxTextCtrl::StreamIn(const wxString& value,
return TRUE;
}
return TRUE;
}
+#endif
+ // __WXWINE__
+
#endif // wxUSE_RICHEDIT
void wxTextCtrl::WriteText(const wxString& value)
#endif // wxUSE_RICHEDIT
void wxTextCtrl::WriteText(const wxString& value)
@@
-654,7
+666,7
@@
void wxTextCtrl::DoWriteText(const wxString& value, bool selectionOnly)
}
#endif // wxUSE_UNICODE_MSLU
}
#endif // wxUSE_UNICODE_MSLU
-#if !wxUSE_UNICODE
+#if !wxUSE_UNICODE
&& !defined(__WXWINE__)
// next check if the text we're inserting must be shown in a non
// default charset -- this only works for RichEdit > 1.0
if ( GetRichVersion() > 1 )
// next check if the text we're inserting must be shown in a non
// default charset -- this only works for RichEdit > 1.0
if ( GetRichVersion() > 1 )
@@
-1177,24
+1189,42
@@
bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg)
}
else // no Alt
{
}
else // no Alt
{
- if ( wxIsCtrlDown() )
+ // we want to process some Ctrl-foo and Shift-bar but no key
+ // combinations without either Ctrl or Shift nor with both of them
+ // pressed
+ const int ctrl = wxIsCtrlDown(),
+ shift = wxIsShiftDown();
+ switch ( ctrl + shift )
{
{
- switch ( vkey )
- {
- case 'C':
- case 'V':
- case 'X':
- case VK_INSERT:
- case VK_DELETE:
- case VK_HOME:
- case VK_END:
- return FALSE;
- }
- }
- else if ( wxIsShiftDown() )
- {
- if ( vkey == VK_INSERT || vkey == VK_DELETE )
- return FALSE;
+ default:
+ wxFAIL_MSG( _T("how many modifiers have we got?") );
+ // fall through
+
+ case 0:
+ case 2:
+ break;
+
+ case 1:
+ // either Ctrl or Shift pressed
+ if ( ctrl )
+ {
+ switch ( vkey )
+ {
+ case 'C':
+ case 'V':
+ case 'X':
+ case VK_INSERT:
+ case VK_DELETE:
+ case VK_HOME:
+ case VK_END:
+ return FALSE;
+ }
+ }
+ else // Shift is pressed
+ {
+ if ( vkey == VK_INSERT || vkey == VK_DELETE )
+ return FALSE;
+ }
}
}
}
}
}
}
@@
-1538,10
+1568,11
@@
void wxTextCtrl::OnUpdateRedo(wxUpdateUIEvent& event)
bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
+#ifndef __WXWINE__
NMHDR *hdr = (NMHDR* )lParam;
switch ( hdr->code )
{
NMHDR *hdr = (NMHDR* )lParam;
switch ( hdr->code )
{
-
case EN_MSGFILTER:
+ case EN_MSGFILTER:
{
const MSGFILTER *msgf = (MSGFILTER *)lParam;
UINT msg = msgf->msg;
{
const MSGFILTER *msgf = (MSGFILTER *)lParam;
UINT msg = msgf->msg;
@@
-1624,7
+1655,8
@@
bool wxTextCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
}
return TRUE;
}
}
return TRUE;
}
-
+#endif
+
// not processed, leave it to the base class
return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
}
// not processed, leave it to the base class
return wxTextCtrlBase::MSWOnNotify(idCtrl, lParam, result);
}
@@
-1681,6
+1713,9
@@
bool wxTextCtrl::SetForegroundColour(const wxColour& colour)
bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
{
+#ifdef __WXWINE__
+ return FALSE;
+#else
if ( !IsRich() )
{
// can't do it with normal text control
if ( !IsRich() )
{
// can't do it with normal text control
@@
-1810,6
+1845,7
@@
bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
}
return ok;
}
return ok;
+#endif
}
bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)
}
bool wxTextCtrl::SetDefaultStyle(const wxTextAttr& style)