Applied patch [ 795542 ] Unicode fixes in richedit sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -334,7 +334,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
|
||||
if( m_StatusBar && m_StatusFieldLabel != -1 &&
|
||||
s_hasPutMessageInStatusBar )
|
||||
{
|
||||
m_StatusBar->SetStatusText("", m_StatusFieldLabel);
|
||||
m_StatusBar->SetStatusText(wxEmptyString, m_StatusFieldLabel);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -576,7 +576,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
|
||||
Copy(TRUE, TRUE);
|
||||
break;
|
||||
case 's': // search
|
||||
Find("");
|
||||
Find(wxEmptyString);
|
||||
break;
|
||||
case 't': // search again
|
||||
FindAgain();
|
||||
@@ -624,7 +624,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event)
|
||||
}
|
||||
break;
|
||||
case 's': // search
|
||||
Find("");
|
||||
Find(wxEmptyString);
|
||||
break;
|
||||
case 't': // search again
|
||||
FindAgain();
|
||||
@@ -846,7 +846,13 @@ wxLayoutWindow::OnPaint( wxPaintEvent &WXUNUSED(event))
|
||||
}
|
||||
|
||||
void
|
||||
wxLayoutWindow::RequestUpdate(const wxRect *updateRect)
|
||||
wxLayoutWindow::RequestUpdate(const wxRect *
|
||||
#ifdef __WXGTK__
|
||||
updateRect
|
||||
#else
|
||||
WXUNUSED(updateRect)
|
||||
#endif
|
||||
)
|
||||
{
|
||||
#ifdef __WXGTK__
|
||||
// Calling Refresh() causes bad flicker under wxGTK!!!
|
||||
@@ -1263,9 +1269,27 @@ wxLayoutWindow::Cut(bool privateFormat, bool usePrimary)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
bool
|
||||
wxLayoutWindow::Find(const wxString &needle,
|
||||
wxPoint * fromWhere,
|
||||
const wxString &configPath)
|
||||
wxLayoutWindow::Find(const wxString &
|
||||
#ifdef M_BASEDIR
|
||||
needle
|
||||
#else
|
||||
WXUNUSED(needle)
|
||||
#endif
|
||||
,
|
||||
wxPoint *
|
||||
#ifdef M_BASEDIR
|
||||
fromWhere
|
||||
#else
|
||||
WXUNUSED(fromWhere)
|
||||
#endif
|
||||
,
|
||||
const wxString &
|
||||
#ifdef M_BASEDIR
|
||||
configPath
|
||||
#else
|
||||
WXUNUSED(configPath)
|
||||
#endif
|
||||
)
|
||||
{
|
||||
#ifdef M_BASEDIR
|
||||
wxPoint found;
|
||||
|
Reference in New Issue
Block a user