*** empty log message ***

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

diff --git a/include/wx/font.h b/include/wx/font.h
index c01172a2990532e873e6afa5f4c3a5ccd840343d..73bcbbafb69b3e2b086ce9f29b48640d3bdf2744 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -195,8 +195,10 @@ private:
 // macros
 // ----------------------------------------------------------------------------
 
 // macros
 // ----------------------------------------------------------------------------
 

+#if !defined(__VISAGECPP__)

 // VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()
 // VZ: this is ugly (FIXME)
 #define M_FONTDATA GetFontData()

+#endif

 
 #endif
     // _WX_FONT_H_BASE_
 
 #endif
     // _WX_FONT_H_BASE_

diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h
index 953da997c6b6249b3f90620b669fe939d7c09412..d24372425a0cde42d9d5c3352e23fa71399830cc 100644 (file)
--- a/include/wx/os2/timer.h
+++ b/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)
     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:
     bool OneShot() const { return m_oneShot; }
 
 protected:


@@ -51,8 +51,6 @@ private:
 
 // Timer functions (milliseconds)
 void WXDLLEXPORT wxStartTimer();
 
 // 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);
 
 // EXPERIMENTAL: comment this out if it doesn't compile.
 bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);

diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp
index 281efc5183181bd2347d4dc0bbdbc3962df7d4bc..2a7eb0791869f5fa8bb4f88eb78941f9e1371421 100644 (file)
--- a/src/generic/progdlgg.cpp
+++ b/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:
 // 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
 #else
     dc.GetTextExtent(message, &widthText, (long*)NULL);
 #endif