[Hugin-cvs] hugin/src/include/hugin PanoDruid.h,1.4,1.5

[Pablo d'A. <da...@us...>]

Update of /cvsroot/hugin/hugin/src/include/hugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20362/include/hugin

Modified Files:
	PanoDruid.h 
Log Message:
MSVC unicode build working now. Had to remove some static instatiation in the
pano druid, because it seemd that wxWindows (especially the unicode string
conversion functions) weren't set up when that hints were added.



Index: PanoDruid.h
===================================================================
RCS file: /cvsroot/hugin/hugin/src/include/hugin/PanoDruid.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PanoDruid.h	10 Nov 2004 09:02:01 -0000	1.4
+++ PanoDruid.h	26 Jan 2005 23:20:51 -0000	1.5
@@ -37,23 +37,25 @@
 {
 public:
     PanoDruid(wxWindow* parent);
+    ~PanoDruid();
     void Update(const PT::Panorama& pano);
     DruidHint* FindHint(const wxChar* name);
 
 protected:
+    void AddHints();
     int m_advice;
     wxStaticBoxSizer  * m_boxSizer;
     wxBitmap m_bitmap;
     wxStaticBitmap * m_graphic;
     wxStaticText * m_text;
 
-    static int sm_hints;
-    static int sm_chunk;
-    static int sm_sorted;
-    static DruidHint** sm_advice;
+    int sm_hints;
+    int sm_chunk;
+    int sm_sorted;
+    DruidHint** sm_advice;
 
 public:
-    static void DefineHint(DruidHint* advice);
+    void DefineHint(DruidHint* advice);
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -71,8 +73,8 @@
             this->graphic = graphic;
             this->brief = brief;
             this->text = text;
-            DEBUG_TRACE( "Adding DruidHint \"" << this->name.mb_str() << "\"..." );
-            PanoDruid::DefineHint(this);
+//            DEBUG_TRACE( "Adding DruidHint \"" << this->name.mb_str() << "\"..." );
+//            PanoDruid::DefineHint(this);
 	}
     virtual int applies(const PT::Panorama& pano, const PT::PanoramaOptions& opts)
         { return FALSE; }
@@ -89,7 +91,7 @@
     int applies(const PT::Panorama& pano, const PT::PanoramaOptions& opts)
 
 #define END_HINT(name) \
-    } _the##name;
+    } 
 
 /////////////////////////////////////////////////////////////////////////////