wxSize/wxPoint/wxRect versions of functions added to wxMSW, wxMotif;
wxScrollBar::Set/GetPosition changed to Set/GetThumbPosition to avoid clash; various other portability changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -38,7 +38,7 @@
|
||||
|
||||
#if wxUSE_XPM_IN_MSW
|
||||
#define FOR_MSW 1
|
||||
#include "../../contrib/wxxpm/libxpm.34b/lib/xpm34.h"
|
||||
#include "../src/xpm/xpm34.h"
|
||||
#endif
|
||||
|
||||
#include "wx/msw/dib.h"
|
||||
@@ -170,7 +170,7 @@ wxBitmap::wxBitmap(const wxString& filename, long type)
|
||||
|
||||
#if wxUSE_XPM_IN_MSW
|
||||
// Create from data
|
||||
wxBitmap::wxBitmap(const char **data, wxItem *WXUNUSED(anItem))
|
||||
wxBitmap::wxBitmap(char **data, wxItem *WXUNUSED(anItem))
|
||||
{
|
||||
(void) Create((void *)data, wxBITMAP_TYPE_XPM_DATA, 0, 0, 0);
|
||||
}
|
||||
|
Reference in New Issue
Block a user