Code cleanup

2 files changed, 2 insertions, 30 deletions

diff --git a/winrt/mupdf_cpp/MainPage.xaml.cpp b/winrt/mupdf_cpp/MainPage.xaml.cpp
index a75f1500..a8b1d930 100644
--- a/winrt/mupdf_cpp/MainPage.xaml.cpp
+++ b/winrt/mupdf_cpp/MainPage.xaml.cpp
@@ -88,7 +88,6 @@ MainPage::MainPage()
     m_linkcolor_brush = ref new SolidColorBrush(color);
 
     // Create the image brush
-    m_renderedImage = ref new ImageBrush();
     mu_doc = nullptr;
     m_docPages = ref new Platform::Collections::Vector<DocumentPage^>();
     CleanUp();
@@ -392,8 +391,6 @@ void mupdf_cpp::MainPage::CleanUp()
     m_slider_max = 0;
     m_init_done = false;
     m_memory_use = 0;
-    m_from_doubleflip = false;
-    m_first_time = false;
     m_insearch = false;
     m_search_active = false;
     m_sliderchange = false;
@@ -405,9 +402,6 @@ void mupdf_cpp::MainPage::CleanUp()
     m_thumb_page_start = 0;
     m_thumb_page_stop = 0;
     m_links_on = false;
-    m_curr_zoom = 1.0;
-    m_canvas_translate.X = 0;
-    m_canvas_translate.Y = 0;
 
     this->xaml_PageSlider->Minimum = m_slider_min;
     this->xaml_PageSlider->Maximum = m_slider_max;
diff --git a/winrt/mupdf_cpp/MainPage.xaml.h b/winrt/mupdf_cpp/MainPage.xaml.h
index 812ad818..e858ebe8 100644
--- a/winrt/mupdf_cpp/MainPage.xaml.h
+++ b/winrt/mupdf_cpp/MainPage.xaml.h
@@ -87,25 +87,14 @@ namespace mupdf_cpp
         int  m_slider_min;
         int  m_slider_max;
         bool m_init_done;
-        bool m_first_time;
         bool m_flip_from_searchlink;
         bool m_links_on;
         int m_search_rect_count;
-        Point m_display_size;
         cancellation_token_source m_searchcts;
         cancellation_token_source m_thumbcts;
         bool m_page_update;
         long long m_memory_use;
-        double m_curr_zoom;
-        Point m_zoom_size;
-        Point m_touchpoint;
-        Point m_canvas_translate;
-        Windows::UI::Input::ManipulationDelta m_changes;
-        ImageBrush^ m_renderedImage;
-        ImageBrush^ m_blankPage;
         WriteableBitmap ^m_BlankBmp;
-        Canvas^ m_renderedCanvas;
-        ImageBrush^ m_zoomedImage;
         SolidColorBrush^ m_textcolor_brush; 
         SolidColorBrush^ m_linkcolor_brush; 
         FlipView^ m_curr_flipView;
@@ -114,14 +103,12 @@ namespace mupdf_cpp
         int m_thumb_page_start;
         int m_thumb_page_stop;
         cancellation_token_source m_ThumbCancel;
-        TextBlock^ m_StatusBlock;
-        bool m_zoom_mode;
-        bool m_from_doubleflip;
-        bool m_scaling_occured;
+        bool m_zoom_mode;  // remove
         bool m_insearch;  /* Used for UI display */
         bool m_search_active;  /* Used to avoid multiple UI clicks */
         bool m_sliderchange;
         bool m_update_flip;
+
 		void Picker(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void Searcher(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void OpenDocumentPrep(StorageFile^ file);
@@ -165,15 +152,6 @@ namespace mupdf_cpp
         void ContentSelected(Platform::Object^ sender, Windows::UI::Xaml::Controls::ItemClickEventArgs^ e);
         void ContentChanged(Platform::Object^ sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs^ e);
         void Reflower(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
-        void WebViewDelta(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationDeltaRoutedEventArgs^ e);
-        void WebViewStarting(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationStartingRoutedEventArgs^ e);
-        void WebViewCompleted(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationCompletedRoutedEventArgs^ e);
-        void TempViewStarting(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationStartingRoutedEventArgs^ e);
-        void RichGridSizeChanged(Platform::Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e);
-        void RichGridManipulationStarting(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationStartingRoutedEventArgs^ e);
-        void RichGridManipulationDelta(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationDeltaRoutedEventArgs^ e);
-        void RichGridManipulationStarted(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationStartedRoutedEventArgs^ e);
-        void RichGridManipulationCompleted(Platform::Object^ sender, Windows::UI::Xaml::Input::ManipulationCompletedRoutedEventArgs^ e);
         void topAppBar_Loaded(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
         void UpdateAppBarButtonViewState();
         bool EnsureUnsnapped();