Fix broken and missing DataView interface items for Phoenix

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

diff --git a/samples/stc/defsext.h b/samples/stc/defsext.h
index eb55caf94a7a8ef57840315cc7608459e8364cd7..89993393d36d8dae22e85b2908b2946da4a98aef 100644 (file)
--- a/samples/stc/defsext.h
+++ b/samples/stc/defsext.h
@@ -15,16 +15,16 @@
 // headers
 //----------------------------------------------------------------------------
 
 // headers
 //----------------------------------------------------------------------------
 

-//! wxWindows headers
-#include <wx/print.h>    // printing support
-#include <wx/printdlg.h> // printing dialog
+//! wxWidgets headers
+#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")


@@ -73,6 +73,7 @@ enum {
     myID_PAGEPREV,
     myID_PAGENEXT,
     myID_SELECTLINE,
     myID_PAGEPREV,
     myID_PAGENEXT,
     myID_SELECTLINE,

+    myID_WINDOW_MINIMAL,

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


@@ -96,9 +97,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_