Make it possible to use svn-find-native-eols script without svn checkout.

[wxWidgets.git] / samples / stc / defsext.h

diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h
index 70d53c821320c6a4a78a3c7fcfbff77009f2c969..97cb8bc18437fc749373014cda92a5224cf100d5 100644 (file)
--- a/samples/stc/defsext.h
+++ b/samples/stc/defsext.h
@@ -16,15 +16,15 @@
 //----------------------------------------------------------------------------
 
 //! wxWidgets headers
 //----------------------------------------------------------------------------
 
 //! wxWidgets headers

-#include <wx/print.h>    // printing support
-#include <wx/printdlg.h> // printing dialog
+#include "wx/print.h"    // printing support
+#include "wx/printdlg.h" // printing dialog

 
 
 //============================================================================
 // declarations
 //============================================================================
 
 
 
 //============================================================================
 // declarations
 //============================================================================
 

-#define DEFAULT_LANGUAGE _("<default>")
+#define DEFAULT_LANGUAGE "<default>"

 
 #define PAGE_COMMON _("Common")
 #define PAGE_LANGUAGES _("Languages")
 
 #define PAGE_COMMON _("Common")
 #define PAGE_LANGUAGES _("Languages")


@@ -40,7 +40,8 @@
 enum {
     // menu IDs
     myID_PROPERTIES = wxID_HIGHEST,
 enum {
     // menu IDs
     myID_PROPERTIES = wxID_HIGHEST,

-    myID_INDENTINC,
+    myID_EDIT_FIRST,
+    myID_INDENTINC = myID_EDIT_FIRST,

     myID_INDENTRED,
     myID_FINDNEXT,
     myID_REPLACE,
     myID_INDENTRED,
     myID_FINDNEXT,
     myID_REPLACE,


@@ -57,6 +58,12 @@ enum {
     myID_OVERTYPE,
     myID_READONLY,
     myID_WRAPMODEON,
     myID_OVERTYPE,
     myID_READONLY,
     myID_WRAPMODEON,

+    myID_ANNOTATION_ADD,
+    myID_ANNOTATION_REMOVE,
+    myID_ANNOTATION_CLEAR,
+    myID_ANNOTATION_STYLE_HIDDEN,
+    myID_ANNOTATION_STYLE_STANDARD,
+    myID_ANNOTATION_STYLE_BOXED,

     myID_CHANGECASE,
     myID_CHANGELOWER,
     myID_CHANGEUPPER,
     myID_CHANGECASE,
     myID_CHANGELOWER,
     myID_CHANGEUPPER,


@@ -73,6 +80,8 @@ enum {
     myID_PAGEPREV,
     myID_PAGENEXT,
     myID_SELECTLINE,
     myID_PAGEPREV,
     myID_PAGENEXT,
     myID_SELECTLINE,

+    myID_EDIT_LAST = myID_SELECTLINE,
+    myID_WINDOW_MINIMAL,

 
     // other IDs
     myID_STATUSBAR,
 
     // other IDs
     myID_STATUSBAR,


@@ -96,9 +105,12 @@ enum {
 //! global application name
 extern wxString *g_appname;
 
 //! global application name
 extern wxString *g_appname;
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 //! global print data, to remember settings during the session
 extern wxPrintData *g_printData;
 //! global print data, to remember settings during the session
 extern wxPrintData *g_printData;

-extern wxPageSetupData *g_pageSetupData;
+extern wxPageSetupDialogData *g_pageSetupData;

 
 

-#endif // _WX_DEFSEXT_H_
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

+#endif // _WX_DEFSEXT_H_