wxResourceManager *wxResourceManager::sm_currentResourceManager = NULL;
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "bitmaps/load.xpm"
#include "bitmaps/save.xpm"
#include "bitmaps/new.xpm"
#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
m_bitmapImage = new wxBitmap( wxwin_xpm );
#endif
}
wxBitmap ToolbarDistributeHorizBitmap("DISTHORIZTOOL");
wxBitmap ToolbarDistributeVertBitmap("DISTVERTTOOL");
#endif
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
wxBitmap ToolbarLoadBitmap( load_xpm );
wxBitmap ToolbarSaveBitmap( save_xpm);
wxBitmap ToolbarNewBitmap( new_xpm );
{
wxString str(res->GetTitle());
int x, y;
- ViewStart(& x, & y);
+ GetViewStart(& x, & y);
wxFont font(10, wxSWISS, wxNORMAL, wxBOLD);
dc.SetFont(font);