git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26407
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
+#ifdef __WXMAC__
+ #include "wx/mac/private.h"
+#endif
// ----------------------------------------------------------------------------
// events
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// events
// ----------------------------------------------------------------------------
m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
+#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+ wxFont font ;
+ font.MacCreateThemeFont( kThemeViewsFont ) ;
+ SetFont( font ) ;
+#endif
if ( InReportView() )
{
CreateHeaderWindow();
if ( InReportView() )
{
CreateHeaderWindow();
wxYield();
#ifdef __WXMAC__
wxYield();
#ifdef __WXMAC__
- MacUpdateImmediately();
// VZ: I like the labels be centered - if the others don't mind, you may
// remove "#ifdef __WXMSW__" and use it for all ports
// VZ: I like the labels be centered - if the others don't mind, you may
// remove "#ifdef __WXMSW__" and use it for all ports
-#if defined(__WXMSW__) || defined(__WXPM__)
+#if defined(__WXMSW__) || defined(__WXPM__) || defined(__WXMAC__)
c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
#else // !MSW
c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
c->left.SameAs(this, wxCentreX, LAYOUT_X_MARGIN);
#else // !MSW
c->right.SameAs(this, wxRight, 2*LAYOUT_X_MARGIN);
- MacUpdateImmediately();
#endif
return m_state != Canceled;
#endif
return m_state != Canceled;
+#ifdef __WXMAC__
+ #include "wx/mac/private.h"
+#endif
+
// -----------------------------------------------------------------------------
// array types
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// array types
// -----------------------------------------------------------------------------
+#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+ m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
+#else
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
m_boldFont = wxFont(m_normalFont.GetPointSize(),
m_normalFont.GetFamily(),
m_normalFont.GetStyle(),
m_boldFont = wxFont(m_normalFont.GetPointSize(),
m_normalFont.GetFamily(),
m_normalFont.GetStyle(),
// We have to call this here because the label in
// question might just have been added and no screen
// update taken place.
// We have to call this here because the label in
// question might just have been added and no screen
// update taken place.
- if (m_dirty) wxYieldIfNeeded();
-
+ if (m_dirty)
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
+ Update();
+#else
+ wxYieldIfNeeded();
+#endif
wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem;
// now scroll to the item
wxGenericTreeItem *gitem = (wxGenericTreeItem*) item.m_pItem;
// now scroll to the item
// question might just have been added and no screen
// update taken place.
if ( m_dirty )
// question might just have been added and no screen
// update taken place.
if ( m_dirty )
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
+ Update();
+#else
m_textCtrl = new wxTreeTextCtrl(this, itemEdit);
m_textCtrl = new wxTreeTextCtrl(this, itemEdit);
// highlight the current drop target if any
DrawDropEffect(m_dropTarget);
// highlight the current drop target if any
DrawDropEffect(m_dropTarget);
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
+ Update();
+#else
}
}
else if ( (event.LeftUp() || event.RightUp()) && m_isDragging )
}
}
else if ( (event.LeftUp() || event.RightUp()) && m_isDragging )
+#if defined( __WXMSW__ ) || defined(__WXMAC__)
+ Update();
+#else