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

Fix for VisualAge; Init can't be before it is called in VA.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-01-24 22:48:07 +00:00
parent 11e654da9c
commit 006713a260
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/calctrl.h
View File

@@ -47,14 +47,16 @@ enum wxCalendarDateBorder
class WXDLLEXPORT wxCalendarDateAttr class WXDLLEXPORT wxCalendarDateAttr
{ {
#if !defined(__VISAGECPP__)
protected: protected:
// This has to be before the use of Init(), for MSVC++ 1.5 // This has to be before the use of Init(), for MSVC++ 1.5
// But dorks up Visualage!
void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE) void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE)
{ {
m_border = border; m_border = border;
m_holiday = FALSE; m_holiday = FALSE;
} }
#endif
public: public:
// ctors // ctors
wxCalendarDateAttr() { Init(); } wxCalendarDateAttr() { Init(); }
@@ -97,7 +99,15 @@ public:
const wxColour& GetBorderColour() const { return m_colBorder; } const wxColour& GetBorderColour() const { return m_colBorder; }
const wxFont& GetFont() const { return m_font; } const wxFont& GetFont() const { return m_font; }
wxCalendarDateBorder GetBorder() const { return m_border; } wxCalendarDateBorder GetBorder() const { return m_border; }
#if defined(__VISAGECPP__)
protected:
// This has to be here for VisualAge
void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE)
{
m_border = border;
m_holiday = FALSE;
}
#endif
private: private:
wxColour m_colText, wxColour m_colText,
m_colBack, m_colBack,