X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a132a1c810bea2d37b09f01524b57440c968de1c..c74d8df09d0c0e182cb2063cc4cc546de3a00fae:/utils/dialoged/src/reseditr.cpp diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp index 6e5c704e05..06ad366005 100644 --- a/utils/dialoged/src/reseditr.cpp +++ b/utils/dialoged/src/reseditr.cpp @@ -58,7 +58,7 @@ 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" @@ -175,7 +175,7 @@ bool wxResourceManager::Initialize() #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 } @@ -769,7 +769,7 @@ wxToolBar *wxResourceManager::OnCreateToolBar(wxFrame *parent) 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 ); @@ -2382,7 +2382,7 @@ void wxResourceEditorScrolledWindow::DrawTitle(wxDC& dc) { wxString str(res->GetTitle()); int x, y; - ViewStart(& x, & y); + GetViewStart(& x, & y); wxFont font(10, wxSWISS, wxNORMAL, wxBOLD); dc.SetFont(font);