reset deferred position/size if the window was moved immediately (#10073)

[wxWidgets.git] / samples / stc / edit.cpp

diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
index 24be6831a8aa15ca830aaf01aed61a9edd08d8e1..30f64ebb2771f0a88e12e9e25848ed79e5346d90 100644 (file)
--- a/samples/stc/edit.cpp
+++ b/samples/stc/edit.cpp
@@ -439,7 +439,7 @@ bool Edit::InitializePrefs (const wxString &name) {
             StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0);
             StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0);
             StyleSetCase (Nr, curType.lettercase);
             StyleSetUnderline (Nr, (curType.fontstyle & mySTC_STYLE_UNDERL) > 0);
             StyleSetVisible (Nr, (curType.fontstyle & mySTC_STYLE_HIDDEN) == 0);
             StyleSetCase (Nr, curType.lettercase);

-            const wxChar *pwords = curInfo->styles[Nr].words;
+            const char *pwords = curInfo->styles[Nr].words;

             if (pwords) {
                 SetKeyWords (keywordnr, pwords);
                 keywordnr += 1;
             if (pwords) {
                 SetKeyWords (keywordnr, pwords);
                 keywordnr += 1;


@@ -709,7 +709,7 @@ EditProperties::EditProperties (Edit *edit,
 // EditPrint
 //----------------------------------------------------------------------------
 
 // EditPrint
 //----------------------------------------------------------------------------
 

-EditPrint::EditPrint (Edit *edit, wxChar *title)
+EditPrint::EditPrint (Edit *edit, const wxChar *title)

               : wxPrintout(title) {
     m_edit = edit;
     m_printed = 0;
               : wxPrintout(title) {
     m_edit = edit;
     m_printed = 0;