XRC spec: relax requirements on some commonly omitted properties.

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

diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h
index e7428b7da5c0052c993667fa6b0c353ee8debab6..de7004562d0eb407c738d30bfe9c3962c54f51aa 100644 (file)
--- a/samples/stc/defsext.h
+++ b/samples/stc/defsext.h
@@ -3,7 +3,6 @@
 // Purpose:     STC test declarations
 // Maintainer:  Wyo
 // Created:     2003-09-01
 // Purpose:     STC test declarations
 // Maintainer:  Wyo
 // Created:     2003-09-01

-// RCS-ID:      $Id$

 // Copyright:   (c) wxGuide
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) wxGuide
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////


@@ -24,7 +23,7 @@
 // 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 +39,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 +57,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 +79,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,


@@ -100,7 +108,7 @@ extern wxString *g_appname;
 
 //! 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 // wxUSE_PRINTING_ARCHITECTURE
 
 
 #endif // wxUSE_PRINTING_ARCHITECTURE