fixed typo in the last before one change (UNIV_HDR, not UNIX_HDR)

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

diff --git a/samples/stc/edit.cpp b/samples/stc/edit.cpp
index 9618eb899258c97448a46ebad3d73799381c78ac..24be6831a8aa15ca830aaf01aed61a9edd08d8e1 100644 (file)
--- a/samples/stc/edit.cpp
+++ b/samples/stc/edit.cpp
@@ -1,5 +1,5 @@
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

-// File:        edit.cpp
+// File:        contrib/samples/stc/edit.cpp

 // Purpose:     STC test module
 // Maintainer:  Wyo
 // Created:     2003-09-01
 // Purpose:     STC test module
 // Maintainer:  Wyo
 // Created:     2003-09-01


@@ -17,8 +17,8 @@
 // headers
 //----------------------------------------------------------------------------
 
 // headers
 //----------------------------------------------------------------------------
 

-// For compilers that support precompilation, includes <wx/wx.h>.
-#include <wx/wxprec.h>
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -27,12 +27,12 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all 'standard' wxWidgets headers)
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 #endif
 
 //! wxWidgets headers
 #endif
 
 //! wxWidgets headers

-#include <wx/file.h>     // raw file io support
-#include <wx/filename.h> // filename support
+#include "wx/file.h"     // raw file io support
+#include "wx/filename.h" // filename support

 
 //! application headers
 #include "defsext.h"     // additional definitions
 
 //! application headers
 #include "defsext.h"     // additional definitions


@@ -502,18 +502,22 @@ bool Edit::InitializePrefs (const wxString &name) {
     return true;
 }
 
     return true;
 }
 

-bool Edit::LoadFile () {
-
+bool Edit::LoadFile ()
+{
+#if wxUSE_FILEDLG

     // get filname
     if (!m_filename) {
         wxFileDialog dlg (this, _T("Open file"), wxEmptyString, wxEmptyString,
     // 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();
     }
 
     // load file
     return LoadFile (m_filename);
         if (dlg.ShowModal() != wxID_OK) return false;
         m_filename = dlg.GetPath();
     }
 
     // load file
     return LoadFile (m_filename);

+#else
+    return false;
+#endif // wxUSE_FILEDLG

 }
 
 bool Edit::LoadFile (const wxString &filename) {
 }
 
 bool Edit::LoadFile (const wxString &filename) {


@@ -544,21 +548,25 @@ bool Edit::LoadFile (const wxString &filename) {
     return true;
 }
 
     return true;
 }
 

-bool Edit::SaveFile () {
-
+bool Edit::SaveFile ()
+{
+#if wxUSE_FILEDLG

     // return if no change
     if (!Modified()) return true;
 
     // get filname
     if (!m_filename) {
         wxFileDialog dlg (this, _T("Save file"), wxEmptyString, wxEmptyString, _T("Any file (*)|*"),
     // return if no change
     if (!Modified()) return true;
 
     // 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();
     }
 
     // save file
     return SaveFile (m_filename);
         if (dlg.ShowModal() != wxID_OK) return false;
         m_filename = dlg.GetPath();
     }
 
     // save file
     return SaveFile (m_filename);

+#else
+    return false;
+#endif // wxUSE_FILEDLG

 }
 
 bool Edit::SaveFile (const wxString &filename) {
 }
 
 bool Edit::SaveFile (const wxString &filename) {


@@ -695,6 +703,8 @@ EditProperties::EditProperties (Edit *edit,
     ShowModal();
 }
 
     ShowModal();
 }
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 //----------------------------------------------------------------------------
 // EditPrint
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // EditPrint
 //----------------------------------------------------------------------------


@@ -821,3 +831,4 @@ bool EditPrint::PrintScaling (wxDC *dc){
     return true;
 }
 
     return true;
 }
 

+#endif // wxUSE_PRINTING_ARCHITECTURE