r186: *** empty log message ***

[ctsim.git] / src / views.h

diff --git a/src/views.h b/src/views.h
index 43751338e6ea68c031241c70d379154c114335ee..71efce20081a48f79fc7bc5ce942fce6825697c4 100644 (file)
--- a/src/views.h
+++ b/src/views.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.h,v 1.5 2000/07/18 16:20:53 kevin Exp $
+**  $Id: views.h,v 1.8 2000/08/31 08:38:58 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -54,6 +54,7 @@ private:
     bool m_bMaxSpecified;
     double m_dMinPixel;
     double m_dMaxPixel;
+    double m_dAutoScaleFactor;
 
 public:
     ImageFileView(void);
@@ -64,8 +65,8 @@ public:
     void OnUpdate(wxView *sender, wxObject *hint = NULL);
     bool OnClose (bool deleteWindow = true);
     void OnProperties (wxCommandEvent& event);
-    void OnWindowAuto (wxCommandEvent& event);
-    void OnWindowMinMax (wxCommandEvent& event);
+    void OnScaleAuto (wxCommandEvent& event);
+    void OnScaleMinMax (wxCommandEvent& event);
 
     ImageFileDocument* GetDocument(void) 
        { return dynamic_cast<ImageFileDocument*>(wxView::GetDocument()); }
@@ -144,9 +145,9 @@ public:
     virtual ~PhantomView(void);
 
     bool OnCreate(wxDocument *doc, long flags);
-    void OnDraw(wxDC* dc);
     void OnUpdate(wxView *sender, wxObject *hint = NULL);
     bool OnClose (bool deleteWindow = true);
+    void OnDraw(wxDC* dc);
     void OnProperties (wxCommandEvent& event);
     void OnRasterize (wxCommandEvent& event);
     void OnProjections (wxCommandEvent& event);
@@ -157,12 +158,13 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
-class PhantomCanvas: public wxPanel
+class PhantomCanvas: public wxScrolledWindow
 {
 public:
     PhantomView* m_pView;
     
     PhantomCanvas (PhantomView* v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
+
     virtual void OnDraw(wxDC& dc);
 
 };