*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/font.h

@@ -195,8 +195,10 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
+#if !defined(__VISAGECPP__)
 // VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()
+#endif
 
 #endif
     // _WX_FONT_H_BASE_

include/wx/os2/timer.h

@@ -31,7 +31,7 @@ public:
     virtual void Notify() = 0;                 // Override this member
 
     // Returns the current interval time (0 if stop)
-    int Interval() const { return m_milli; }; 
+    int Interval() const { return m_milli; };
     bool OneShot() const { return m_oneShot; }
 
 protected:
@@ -51,8 +51,6 @@ private:
 
 // Timer functions (milliseconds)
 void WXDLLEXPORT wxStartTimer();
-// Gets time since last wxStartTimer or wxGetElapsedTime
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
 
 // EXPERIMENTAL: comment this out if it doesn't compile.
 bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);

src/generic/progdlgg.cpp

@@ -104,7 +104,7 @@ wxProgressDialog::wxProgressDialog(wxString const &title,
 // have two versions of this in wxWindowDC tp avoid function hiding
 // since there are two of these in wxDCBase, and in turn in wxDC.
 // VA cannot resolve this so:
-    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL, FALSE);
+    dc.GetTextExtent(message, &widthText, NULL, NULL, NULL, NULL);
 #else
     dc.GetTextExtent(message, &widthText, (long*)NULL);
 #endif