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 a921882b5d7779aae945f0410422fddafaacf6b3..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);
-            const wxChar *pwords = curInfo->styles[Nr].words;
+            const char *pwords = curInfo->styles[Nr].words;
             if (pwords) {
                 SetKeyWords (keywordnr, pwords);
                 keywordnr += 1;
@@ -508,7 +508,7 @@ bool Edit::LoadFile ()
     // get filname
     if (!m_filename) {
         wxFileDialog dlg (this, _T("Open file"), wxEmptyString, wxEmptyString,
-                          _T("Any file (*)|*"), wxOPEN | wxFILE_MUST_EXIST | wxCHANGE_DIR);
+                          _T("Any file (*)|*"), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR);
         if (dlg.ShowModal() != wxID_OK) return false;
         m_filename = dlg.GetPath();
     }
@@ -557,7 +557,7 @@ bool Edit::SaveFile ()
     // get filname
     if (!m_filename) {
         wxFileDialog dlg (this, _T("Save file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"),
-                          wxSAVE | wxOVERWRITE_PROMPT);
+                          wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
         if (dlg.ShowModal() != wxID_OK) return false;
         m_filename = dlg.GetPath();
     }
@@ -709,7 +709,7 @@ EditProperties::EditProperties (Edit *edit,
 // EditPrint
 //----------------------------------------------------------------------------
 
-EditPrint::EditPrint (Edit *edit, wxChar *title)
+EditPrint::EditPrint (Edit *edit, const wxChar *title)
               : wxPrintout(title) {
     m_edit = edit;
     m_printed = 0;