From f1415824cc6ef5c78e805122ac00c84ce140e4a6 Mon Sep 17 00:00:00 2001 From: David Webster Date: Sat, 2 Oct 1999 03:15:13 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/font.h | 2 ++ include/wx/os2/timer.h | 4 +--- src/generic/progdlgg.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/font.h b/include/wx/font.h index c01172a299..73bcbbafb6 100644 --- a/include/wx/font.h +++ b/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_ diff --git a/include/wx/os2/timer.h b/include/wx/os2/timer.h index 953da997c6..d24372425a 100644 --- 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) - 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); diff --git a/src/generic/progdlgg.cpp b/src/generic/progdlgg.cpp index 281efc5183..2a7eb07918 100644 --- 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: - 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 -- 2.45.2