Applied patch [ 858324 ] Calling EndModal inside an EVT_INIT_DIALOG event handler

[wxWidgets.git] / include / wx / generic / calctrl.h

diff --git a/include/wx/generic/calctrl.h b/include/wx/generic/calctrl.h
index 8c7666012563b703932b0476140a02924a24111b..f7d3d6abbca3479cc390cadb411204f8eeeb57e3 100644 (file)
--- a/include/wx/generic/calctrl.h
+++ b/include/wx/generic/calctrl.h
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "calctrl.h"
 #endif
 
     #pragma interface "calctrl.h"
 #endif
 


@@ -29,7 +29,7 @@ class WXDLLEXPORT wxSpinCtrl;
 // wxCalendarCtrl: a control allowing the user to pick a date interactively
 // ----------------------------------------------------------------------------
 
 // wxCalendarCtrl: a control allowing the user to pick a date interactively
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCalendarCtrl : public wxControl
+class WXDLLIMPEXP_ADV wxCalendarCtrl : public wxControl

 {
 friend class wxMonthComboBox;
 friend class wxYearSpinCtrl;
 {
 friend class wxMonthComboBox;
 friend class wxYearSpinCtrl;


@@ -242,10 +242,12 @@ private:
     // show the correct controls
     void ShowCurrentControls();
 
     // show the correct controls
     void ShowCurrentControls();
 

+public:

     // get the currently shown control for month/year
     wxControl *GetMonthControl() const;
     wxControl *GetYearControl() const;
 
     // get the currently shown control for month/year
     wxControl *GetMonthControl() const;
     wxControl *GetYearControl() const;
 

+private:

     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush
     // OnPaint helper-methods
 
     // Highlight the [fromdate : todate] range using pen and brush