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

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

diff --git a/include/wx/calctrl.h b/include/wx/calctrl.h
index 59e3e68027c5a7d13fc50999db314ae4abb50cf1..af575d9b2be6e4cd64feafac286bbaed66179883 100644 (file)
--- a/include/wx/calctrl.h
+++ b/include/wx/calctrl.h
@@ -47,14 +47,16 @@ enum wxCalendarDateBorder
 
 class WXDLLEXPORT wxCalendarDateAttr
 {
 
 class WXDLLEXPORT wxCalendarDateAttr
 {

+#if !defined(__VISAGECPP__)

 protected:
     // This has to be before the use of Init(), for MSVC++ 1.5
 protected:
     // This has to be before the use of Init(), for MSVC++ 1.5

+    // But dorks up Visualage!

     void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE)
     {
         m_border = border;
         m_holiday = FALSE;
     }
     void Init(wxCalendarDateBorder border = wxCAL_BORDER_NONE)
     {
         m_border = border;
         m_holiday = FALSE;
     }

-
+#endif

 public:
     // ctors
     wxCalendarDateAttr() { Init(); }
 public:
     // ctors
     wxCalendarDateAttr() { Init(); }


@@ -97,7 +99,15 @@ public:
     const wxColour& GetBorderColour() const { return m_colBorder; }
     const wxFont& GetFont() const { return m_font; }
     wxCalendarDateBorder GetBorder() const { return m_border; }
     const wxColour& GetBorderColour() const { return m_colBorder; }
     const wxFont& GetFont() const { return m_font; }
     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:
     wxColour m_colText,
              m_colBack,
 private:
     wxColour m_colText,
              m_colBack,