Applied initial patches for wx2.8 compatibility

[ctsim.git] / src / dialogs.h

diff --git a/src/dialogs.h b/src/dialogs.h
index 79264ffbd52f1397f7f1f08e24178e2786439f5d..26d66f8cfb90f9c950743151f0d55dbe8d593442 100644 (file)
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: dialogs.h,v 1.38 2001/09/24 11:46:17 kevin Exp $
+**  $Id$
 **
 **  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
@@ -44,7 +44,7 @@ class CTSimHelpButton : public wxButton
 {
 public:
   CTSimHelpButton (wxWindow* parent, int id)
-    : wxButton (parent, id, "Help")
+    : wxButton (parent, id, _T("Help"))
   {}
 };
 
@@ -57,7 +57,12 @@ public:
 class StringValueAndTitleListBox : public wxListBox
 {
  public:
-  StringValueAndTitleListBox (wxDialog* pParent, int nChoices, const char* const aszTitle[], const char* const aszValue[]);
+  StringValueAndTitleListBox (wxDialog* pParent, int nChoices, wxChar const* const* asTitle,
+                              char const* const aszValue[]);
+  StringValueAndTitleListBox (wxDialog* pParent, int nChoices, wxChar const* title,
+                              char const* const* aszTitle, char const* const* aszValue);
+  StringValueAndTitleListBox (wxDialog* pParent, int nChoices, wxChar const* title,
+                              wxChar const* const* asTitle, char const* const* aszValue);
 
     const char* getSelectionStringValue () const;
 
@@ -69,7 +74,7 @@ class StringValueAndTitleListBox : public wxListBox
 class StringValueAndTitleRadioBox : public wxRadioBox
 {
  public:
-  StringValueAndTitleRadioBox (wxDialog* pParent, const wxString& strTitle, int nChoices, const char* const aszTitle[], const char* const aszValue[]);
+  StringValueAndTitleRadioBox (wxDialog* pParent, wxChar const* strTitle, int nChoices, const char* const aszTitle[], const char* const aszValue[]);
 
   const char* getSelectionStringValue () const;
 
@@ -108,7 +113,7 @@ class ImageFileDocument;
 class DialogGetComparisonImage : public wxDialog
 {
  public:
-   DialogGetComparisonImage (wxWindow* pParent, const char* const pszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);
+   DialogGetComparisonImage (wxWindow* pParent, wxChar const * pwszTitle, const std::vector<ImageFileDocument*>& rVecIF, bool bShowMakeDifference);
     virtual ~DialogGetComparisonImage () {}
 
     ImageFileDocument* getImageFileDocument ();
@@ -125,7 +130,7 @@ class DialogGetComparisonImage : public wxDialog
 class DialogPreferences : public wxDialog
 {
  public:
-    DialogPreferences (wxWindow* pParent, const char* const pszTitle, bool bAdvanced, bool bAskNewDocs,
+  DialogPreferences (wxWindow* pParent, wxChar const* pszTitle, bool bAdvanced, bool bAskNewDocs,
       bool bVerboseLogging, bool bStartupTips, bool bUseBackgroundTasks);
     virtual ~DialogPreferences ();
 
@@ -148,7 +153,7 @@ class ImageFile;
 class DialogGetMinMax : public wxDialog
 {
  public:
-    DialogGetMinMax (wxWindow* pParent, const char* const pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.);
+    DialogGetMinMax (wxWindow* pParent, wxChar const* pszTitle, double dDefaultMin = 0., double dDefaultMax = 0.);
     virtual ~DialogGetMinMax ();
 
     double getMinimum ();
@@ -166,7 +171,7 @@ class DialogGetMinMax : public wxDialog
 class DialogGetRasterParameters : public wxDialog
 {
  public:
-    DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, 
+    DialogGetRasterParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0,
       int iDefaultNSamples = 1, double dDefaultViewRatio = 1);
     virtual ~DialogGetRasterParameters ();
 
@@ -191,15 +196,15 @@ class DialogGetRasterParameters : public wxDialog
 class DialogGetProjectionParameters : public wxDialog
 {
  public:
-    DialogGetProjectionParameters (wxWindow* pParent, int iDefaultNDet = 0, 
-      int iDefaultNView = 0, int iDefaultOffsetView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1., 
-      double dDefaultFocalLength = 1, double dDefaultCenterDetectorLength = 1, double dDefaultViewRatio = 1., 
+    DialogGetProjectionParameters (wxWindow* pParent, int iDefaultNDet = 0,
+      int iDefaultNView = 0, int iDefaultOffsetView = 0, int iDefaultNSamples = 1, double dDefaultRotAngle = 1.,
+      double dDefaultFocalLength = 1, double dDefaultCenterDetectorLength = 1, double dDefaultViewRatio = 1.,
       double dDefaultScanRatio = 1., int iDefaultGeometry = Scanner::GEOMETRY_PARALLEL, int iDefaultTrace = Trace::TRACE_NONE);
     ~DialogGetProjectionParameters ();
 
     unsigned int getNDet ();
     unsigned int getNView ();
-         unsigned int getOffsetView ();
+          unsigned int getOffsetView ();
     unsigned int getNSamples ();
     int getTrace ();
 
@@ -225,7 +230,7 @@ class DialogGetProjectionParameters : public wxDialog
 
     int m_iDefaultNDet;
     int m_iDefaultNView;
-         int m_iDefaultOffsetView;
+          int m_iDefaultOffsetView;
     int m_iDefaultNSamples;
     int m_iDefaultTrace;
     int m_iDefaultGeometry;
@@ -241,12 +246,12 @@ class DialogGetProjectionParameters : public wxDialog
 class DialogGetReconstructionParameters : public wxDialog
 {
  public:
-    DialogGetReconstructionParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0, 
-      int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1., 
-      int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION, 
-      int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT, 
-      int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR, 
-      int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF, 
+    DialogGetReconstructionParameters (wxWindow* pParent, int iDefaultXSize = 0, int iDefaultYSize = 0,
+      int iDefaultFilterID = SignalFilter::FILTER_ABS_BANDLIMIT, double dDefaultFilterParam = 1.,
+      int iDefaultFilterMethodID = ProcessSignal::FILTER_METHOD_CONVOLUTION,
+      int iDefaultFilterGeneration = ProcessSignal::FILTER_GENERATION_DIRECT,
+      int iDefaultZeropad = 3, int iDefaultInterpID = Backprojector::INTERP_LINEAR,
+      int iDefaultInterpParam = 1, int iDefaultBackprojectID = Backprojector::BPROJ_IDIFF,
       int iDefaultTrace = Trace::TRACE_NONE, ReconstructionROI* pROI = NULL);
     virtual ~DialogGetReconstructionParameters ();
 
@@ -362,9 +367,9 @@ class DialogAutoScaleParameters : public wxDialog
 
  private:
     const double m_dMean;
-       const double m_dMode;
-       const double m_dMedian;
-       const double m_dStdDev;
+        const double m_dMode;
+        const double m_dMedian;
+        const double m_dStdDev;
 
     wxTextCtrl* m_pTextCtrlStdDevFactor;
     wxRadioBox* m_pRadioBoxCenter;
@@ -373,7 +378,7 @@ class DialogAutoScaleParameters : public wxDialog
 class DialogGetXYSize : public wxDialog
 {
  public:
-    DialogGetXYSize (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1);
+    DialogGetXYSize (wxWindow* pParent, wxChar const * pwszTitle, int iDefaultXSize = 1, int iDefaultYSize = 1);
     virtual ~DialogGetXYSize ();
 
     unsigned int getXSize ();
@@ -391,9 +396,9 @@ class DialogGetXYSize : public wxDialog
 class DialogGetConvertPolarParameters : public wxDialog
 {
  public:
-   DialogGetConvertPolarParameters (wxWindow* pParent, const char* const pszTitle, int iDefaultXSize = 0, 
-     int iDefaultYSize = 0, int iDefaultInterpolationID = Projections::POLAR_INTERP_BILINEAR, 
-     int iDefaultZeropad = 1, int iHelpID = IDH_DLG_POLAR);
+   DialogGetConvertPolarParameters (wxWindow* pParent, wxChar const * pwszTitle, int iDefaultXSize = 0,
+     int iDefaultYSize = 0, int iDefaultInterpolationID = Projections::POLAR_INTERP_BILINEAR,
+     int iDefaultZeropad = 3, int iHelpID = IDH_DLG_POLAR);
    virtual ~DialogGetConvertPolarParameters ();
 
     unsigned int getXSize();