diff include/mask.h @ 2:c066fde99517

Added Batch Print Mode.
author pyon@macmini
date Fri, 23 Aug 2013 18:32:09 +0900
parents 7b6dab24f4b8
children
line wrap: on
line diff
--- a/include/mask.h	Sun Aug 04 21:42:49 2013 +0900
+++ b/include/mask.h	Fri Aug 23 18:32:09 2013 +0900
@@ -1,5 +1,5 @@
 // Filename   : mask.h
-// Last Change: 04-Aug-2013.
+// Last Change: 14-Aug-2013.
 //
 
 #ifndef __MASK_H__
@@ -13,8 +13,19 @@
 {
     DECLARE_EVENT_TABLE()
 	private:
+        long          x, y, w, h;
+        wxRect        m_mask1;
+        wxRect        m_mask2;
+        wxRect        m_mask3;
+        wxRect        m_mask1old;
+        wxRect        m_mask2old;
+        wxRect        m_mask3old;
 	
 	protected:
+		wxNotebook*   m_notebook;
+		wxPanel*      m_panel;
+		wxPanel*      m_panelold;
+
 		wxStaticText* m_staticTextDummy0;
 		wxStaticText* m_staticTextX;
 		wxStaticText* m_staticTextY;
@@ -39,14 +50,33 @@
 		wxTextCtrl*   m_textCtrlM3w;
 		wxTextCtrl*   m_textCtrlM3h;
 
+		wxStaticText* m_staticTextDummy0Old;
+		wxStaticText* m_staticTextXOld;
+		wxStaticText* m_staticTextYOld;
+		wxStaticText* m_staticTextWOld;
+		wxStaticText* m_staticTextHOld;
+
+		wxStaticText* m_staticTextMask1Old;
+		wxTextCtrl*   m_textCtrlM1xOld;
+		wxTextCtrl*   m_textCtrlM1yOld;
+		wxTextCtrl*   m_textCtrlM1wOld;
+		wxTextCtrl*   m_textCtrlM1hOld;
+
+		wxStaticText* m_staticTextMask2Old;
+		wxTextCtrl*   m_textCtrlM2xOld;
+		wxTextCtrl*   m_textCtrlM2yOld;
+		wxTextCtrl*   m_textCtrlM2wOld;
+		wxTextCtrl*   m_textCtrlM2hOld;
+
+		wxStaticText* m_staticTextMask3Old;
+		wxTextCtrl*   m_textCtrlM3xOld;
+		wxTextCtrl*   m_textCtrlM3yOld;
+		wxTextCtrl*   m_textCtrlM3wOld;
+		wxTextCtrl*   m_textCtrlM3hOld;
+
 		wxButton*     m_buttonCancel;
 		wxButton*     m_buttonSet;
 	
-        long          x, y, w, h;
-        wxRect        m_mask1;
-        wxRect        m_mask2;
-        wxRect        m_mask3;
-
 	public:
 		
 		MaskDialog( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style );
@@ -59,9 +89,15 @@
         void SetMask1( wxRect rect ) { m_mask1 = rect; }
         void SetMask2( wxRect rect ) { m_mask2 = rect; }
         void SetMask3( wxRect rect ) { m_mask3 = rect; }
+        void SetMask1Old( wxRect rect ) { m_mask1old = rect; }
+        void SetMask2Old( wxRect rect ) { m_mask2old = rect; }
+        void SetMask3Old( wxRect rect ) { m_mask3old = rect; }
         wxRect GetMask1() const { return m_mask1; }
         wxRect GetMask2() const { return m_mask2; }
         wxRect GetMask3() const { return m_mask3; }
+        wxRect GetMask1Old() const { return m_mask1old; }
+        wxRect GetMask2Old() const { return m_mask2old; }
+        wxRect GetMask3Old() const { return m_mask3old; }
 };
 
 enum {