Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed cell and label alignment functions to use wxALIGN_XXX defs.

Browse Source 
SetXXXAlignment() functions still accept wxTOP, wxLEFT etc
for (some) backwards compatibility.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Bedward
2000-07-27 01:57:24 +00:00
parent 5c69031cd1
commit 4c7277db42
2 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/grid.h
View File

@@ -1046,8 +1046,8 @@ public:
// ------ Cell text drawing functions // ------ Cell text drawing functions
// //
void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&, void DrawTextRectangle( wxDC& dc, const wxString&, const wxRect&,
int horizontalAlignment = wxLEFT, int horizontalAlignment = wxALIGN_LEFT,
int verticalAlignment = wxTOP ); int verticalAlignment = wxALIGN_TOP );
// Split a string containing newline chararcters into an array of // Split a string containing newline chararcters into an array of
// strings and return the number of lines // strings and return the number of lines
@@ -1493,7 +1493,7 @@ public:
void SetEditInPlace(bool WXUNUSED(edit) = TRUE) { } void SetEditInPlace(bool WXUNUSED(edit) = TRUE) { }
void SetCellAlignment( int align, int row, int col) void SetCellAlignment( int align, int row, int col)
{ SetCellAlignment(row, col, align, wxCENTER); } { SetCellAlignment(row, col, align, wxALIGN_CENTER); }
void SetCellAlignment( int WXUNUSED(align) ) {} void SetCellAlignment( int WXUNUSED(align) ) {}
void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col)) void SetCellBitmap(wxBitmap *WXUNUSED(bitmap), int WXUNUSED(row), int WXUNUSED(col))
{ } { }

64
src/generic/grid.cpp
View File

@@ -1559,7 +1559,7 @@ void wxGridCellNumberRenderer::Draw(wxGrid& grid,
// draw the text right aligned by default // draw the text right aligned by default
int hAlign, vAlign; int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign); attr.GetAlignment(&hAlign, &vAlign);
hAlign = wxRIGHT; hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell; wxRect rect = rectCell;
rect.Inflate(-1); rect.Inflate(-1);
@@ -1654,7 +1654,7 @@ void wxGridCellFloatRenderer::Draw(wxGrid& grid,
// draw the text right aligned by default // draw the text right aligned by default
int hAlign, vAlign; int hAlign, vAlign;
attr.GetAlignment(&hAlign, &vAlign); attr.GetAlignment(&hAlign, &vAlign);
hAlign = wxRIGHT; hAlign = wxALIGN_RIGHT;
wxRect rect = rectCell; wxRect rect = rectCell;
rect.Inflate(-1); rect.Inflate(-1);
@@ -3374,7 +3374,7 @@ void wxGrid::Create()
// Set default cell attributes // Set default cell attributes
m_defaultCellAttr->SetFont(GetFont()); m_defaultCellAttr->SetFont(GetFont());
m_defaultCellAttr->SetAlignment(wxLEFT, wxTOP); m_defaultCellAttr->SetAlignment(wxALIGN_LEFT, wxALIGN_TOP);
m_defaultCellAttr->SetTextColour( m_defaultCellAttr->SetTextColour(
wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT)); wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOWTEXT));
m_defaultCellAttr->SetBackgroundColour( m_defaultCellAttr->SetBackgroundColour(
@@ -3506,11 +3506,11 @@ void wxGrid::Init()
m_labelFont = this->GetFont(); m_labelFont = this->GetFont();
m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 ); m_labelFont.SetWeight( m_labelFont.GetWeight() + 2 );
m_rowLabelHorizAlign = wxLEFT; m_rowLabelHorizAlign = wxALIGN_LEFT;
m_rowLabelVertAlign = wxCENTRE; m_rowLabelVertAlign = wxALIGN_CENTRE;
m_colLabelHorizAlign = wxCENTRE; m_colLabelHorizAlign = wxALIGN_CENTRE;
m_colLabelVertAlign = wxTOP; m_colLabelVertAlign = wxALIGN_TOP;
m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH; m_defaultColWidth = WXGRID_DEFAULT_COL_WIDTH;
m_defaultRowHeight = m_gridWin->GetCharHeight(); m_defaultRowHeight = m_gridWin->GetCharHeight();
@@ -6043,15 +6043,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
float x, y; float x, y;
switch ( horizAlign ) switch ( horizAlign )
{ {
case wxRIGHT: case wxALIGN_RIGHT:
x = rect.x + (rect.width - textWidth - 1); x = rect.x + (rect.width - textWidth - 1);
break; break;
case wxCENTRE: case wxALIGN_CENTRE:
x = rect.x + ((rect.width - textWidth)/2); x = rect.x + ((rect.width - textWidth)/2);
break; break;
case wxLEFT: case wxALIGN_LEFT:
default: default:
x = rect.x + 1; x = rect.x + 1;
break; break;
@@ -6059,15 +6059,15 @@ void wxGrid::DrawTextRectangle( wxDC& dc,
switch ( vertAlign ) switch ( vertAlign )
{ {
case wxBOTTOM: case wxALIGN_BOTTOM:
y = rect.y + (rect.height - textHeight - 1); y = rect.y + (rect.height - textHeight - 1);
break; break;
case wxCENTRE: case wxALIGN_CENTRE:
y = rect.y + ((rect.height - textHeight)/2); y = rect.y + ((rect.height - textHeight)/2);
break; break;
case wxTOP: case wxALIGN_TOP:
default: default:
y = rect.y + 1; y = rect.y + 1;
break; break;
@@ -7187,12 +7187,27 @@ void wxGrid::SetLabelFont( const wxFont& font )
void wxGrid::SetRowLabelAlignment( int horiz, int vert ) void wxGrid::SetRowLabelAlignment( int horiz, int vert )
{ {
if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) // allow old (incorrect) defs to be used
switch ( horiz )
{
case wxLEFT: horiz = wxALIGN_LEFT; break;
case wxRIGHT: horiz = wxALIGN_RIGHT; break;
case wxCENTRE: horiz = wxALIGN_CENTRE; break;
}
switch ( vert )
{
case wxTOP: vert = wxALIGN_TOP; break;
case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
case wxCENTRE: vert = wxALIGN_CENTRE; break;
}
if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{ {
m_rowLabelHorizAlign = horiz; m_rowLabelHorizAlign = horiz;
} }
if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{ {
m_rowLabelVertAlign = vert; m_rowLabelVertAlign = vert;
} }
@@ -7205,12 +7220,27 @@ void wxGrid::SetRowLabelAlignment( int horiz, int vert )
void wxGrid::SetColLabelAlignment( int horiz, int vert ) void wxGrid::SetColLabelAlignment( int horiz, int vert )
{ {
if ( horiz == wxLEFT || horiz == wxCENTRE || horiz == wxRIGHT ) // allow old (incorrect) defs to be used
switch ( horiz )
{
case wxLEFT: horiz = wxALIGN_LEFT; break;
case wxRIGHT: horiz = wxALIGN_RIGHT; break;
case wxCENTRE: horiz = wxALIGN_CENTRE; break;
}
switch ( vert )
{
case wxTOP: vert = wxALIGN_TOP; break;
case wxBOTTOM: vert = wxALIGN_BOTTOM; break;
case wxCENTRE: vert = wxALIGN_CENTRE; break;
}
if ( horiz == wxALIGN_LEFT || horiz == wxALIGN_CENTRE || horiz == wxALIGN_RIGHT )
{ {
m_colLabelHorizAlign = horiz; m_colLabelHorizAlign = horiz;
} }
if ( vert == wxTOP || vert == wxCENTRE || vert == wxBOTTOM ) if ( vert == wxALIGN_TOP || vert == wxALIGN_CENTRE || vert == wxALIGN_BOTTOM )
{ {
m_colLabelVertAlign = vert; m_colLabelVertAlign = vert;
} }