Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / samples / printing / printing.h

diff --git a/samples/printing/printing.h b/samples/printing/printing.h
index e167f6970dac022d70854a055b7fff34505d13d4..a138d541b4890c931d5be7c65ca276b71d4404f5 100644 (file)
--- a/samples/printing/printing.h
+++ b/samples/printing/printing.h
@@ -58,11 +58,14 @@ public:
     void OnPageMargins(wxCommandEvent& event);
 #endif
 
+    void OnPreviewFrameModalityKind(wxCommandEvent& event);
+
     void OnExit(wxCommandEvent& event);
     void OnPrintAbout(wxCommandEvent& event);
 
 private:
     MyCanvas* m_canvas;
+    wxPreviewFrameModalityKind m_previewModality;
 
     DECLARE_EVENT_TABLE()
 };
@@ -84,13 +87,13 @@ private:
 class MyPrintout: public wxPrintout
 {
 public:
-    MyPrintout(MyFrame* frame, const wxString &title = _T("My printout"))
+    MyPrintout(MyFrame* frame, const wxString &title = wxT("My printout"))
         : wxPrintout(title) { m_frame=frame; }
 
-    bool OnPrintPage(int page);
-    bool HasPage(int page);
-    bool OnBeginDocument(int startPage, int endPage);
-    void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
+    virtual bool OnPrintPage(int page);
+    virtual bool HasPage(int page);
+    virtual bool OnBeginDocument(int startPage, int endPage);
+    virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
 
     void DrawPageOne();
     void DrawPageTwo();
@@ -104,16 +107,22 @@ private:
 
 
 // constants:
+enum
+{
+    WXPRINT_PAGE_SETUP = 103,
 
-#define WXPRINT_PAGE_SETUP      103
-
-#define WXPRINT_PRINT_PS        105
-#define WXPRINT_PAGE_SETUP_PS   107
-#define WXPRINT_PREVIEW_PS      108
+    WXPRINT_PRINT_PS,
+    WXPRINT_PAGE_SETUP_PS,
+    WXPRINT_PREVIEW_PS,
 
-#define WXPRINT_ANGLEUP         110
-#define WXPRINT_ANGLEDOWN       111
+    WXPRINT_ANGLEUP,
+    WXPRINT_ANGLEDOWN,
 
 #ifdef __WXMAC__
-    #define WXPRINT_PAGE_MARGINS 112
+    WXPRINT_PAGE_MARGINS,
 #endif
+
+    WXPRINT_FRAME_MODAL_APP,
+    WXPRINT_FRAME_MODAL_WIN,
+    WXPRINT_FRAME_MODAL_NON
+};