Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-10-02 03:15:13 +00:00
parent ce44c50e9b
commit f1415824cc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/font.h
View File

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

4
include/wx/os2/timer.h
View File

@@ -31,7 +31,7 @@ public:
virtual void Notify() = 0; // Override this member virtual void Notify() = 0; // Override this member
// Returns the current interval time (0 if stop) // 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; } bool OneShot() const { return m_oneShot; }
protected: protected:
@@ -51,8 +51,6 @@ private:
// Timer functions (milliseconds) // Timer functions (milliseconds)
void WXDLLEXPORT wxStartTimer(); 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. // EXPERIMENTAL: comment this out if it doesn't compile.
bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved); bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);

2
src/generic/progdlgg.cpp
View File

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