Fixes for WXWIN_COMPATIBILITY, and BC++ fix for event.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -400,7 +400,7 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame
|
||||
public:
|
||||
wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title,
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long type = wxDEFAULT_FRAME, const wxString& name = "frame");
|
||||
long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
|
||||
|
||||
// Extend event processing to search the document manager's event table
|
||||
virtual bool ProcessEvent(wxEvent& event);
|
||||
|
@@ -40,10 +40,10 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
|
||||
wxRect singleCustomColourRect;
|
||||
|
||||
// Size of each colour rectangle
|
||||
wxIntPoint smallRectangleSize;
|
||||
wxPoint smallRectangleSize;
|
||||
|
||||
// For single customizable colour
|
||||
wxIntPoint customRectangleSize;
|
||||
wxPoint customRectangleSize;
|
||||
|
||||
// Grid spacing (between rectangles)
|
||||
int gridSpacing;
|
||||
|
@@ -115,6 +115,8 @@ public:
|
||||
DrawIcon(icon, pt.x, pt.y);
|
||||
}
|
||||
|
||||
virtual void DrawBitmap( const wxBitmap &bmp, long x, long y, bool useMask=FALSE );
|
||||
|
||||
inline void DrawPoint(wxPoint& point) { DrawPoint(point.x, point.y); }
|
||||
virtual void DrawLines(wxList *list, long xoffset = 0, long yoffset = 0);
|
||||
virtual void DrawPolygon(wxList *list, long xoffset = 0, long yoffset = 0, int fillStyle=wxODDEVEN_RULE);
|
||||
|
@@ -170,7 +170,7 @@ class WXDLLEXPORT wxPreviewFrame: public wxFrame
|
||||
public:
|
||||
wxPreviewFrame(wxPrintPreviewBase *preview, wxFrame *parent, const wxString& title = "Print Preview",
|
||||
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
|
||||
long style = wxDEFAULT_FRAME, const wxString& name = "frame");
|
||||
long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
|
||||
~wxPreviewFrame();
|
||||
|
||||
bool OnClose();
|
||||
|
Reference in New Issue
Block a user