New grid control OS/2 compile issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -12,7 +12,7 @@
|
|||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
|
#if !defined(wxUSE_NEW_GRID) || !(wxUSE_NEW_GRID)
|
||||||
#include "gridg.h"
|
#include "wx/generic/gridg.h"
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#ifndef __WXGRID_H__
|
#ifndef __WXGRID_H__
|
||||||
@@ -649,7 +649,7 @@ private:
|
|||||||
Unset = -1,
|
Unset = -1,
|
||||||
ReadWrite,
|
ReadWrite,
|
||||||
ReadOnly
|
ReadOnly
|
||||||
};
|
};
|
||||||
|
|
||||||
// the common part of all ctors
|
// the common part of all ctors
|
||||||
void Init()
|
void Init()
|
||||||
@@ -1080,7 +1080,7 @@ public:
|
|||||||
void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
|
void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
|
||||||
int horizontalAlignment = wxALIGN_LEFT,
|
int horizontalAlignment = wxALIGN_LEFT,
|
||||||
int verticalAlignment = wxALIGN_TOP );
|
int verticalAlignment = wxALIGN_TOP );
|
||||||
|
|
||||||
void DrawTextRectangle( wxDC& dc, const wxArrayString& lines, const wxRect&,
|
void DrawTextRectangle( wxDC& dc, const wxArrayString& lines, const wxRect&,
|
||||||
int horizontalAlignment = wxALIGN_LEFT,
|
int horizontalAlignment = wxALIGN_LEFT,
|
||||||
int verticalAlignment = wxALIGN_TOP );
|
int verticalAlignment = wxALIGN_TOP );
|
||||||
|
Reference in New Issue
Block a user