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

fix build for digital mars 8.35 and grid samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@23245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2003-08-26 20:05:41 +00:00
parent b1aaaadc5a
commit ee8a3ffa4f
3 changed files with 50 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/grid/makefile.sc
View File

@@ -1,6 +1,6 @@
#Digital Mars (was Symantec) C++ makefile
WXDIR = ..\..
EXTRALIBS=
TARGET=griddemo
TARGET=grid
OBJECTS= $(TARGET).obj
include $(WXDIR)\src\makeprog.sc

40
samples/newgrid/makefile.sc
View File

@@ -1,36 +1,6 @@
# Symantec C++ makefile
WXDIR = $(WXWIN)
WXLIB = $(WXDIR)\lib\wx.lib
INCDIR = $(WXDIR)\include
INCLUDE=$(INCDIR)
#Digital Mars (was Symantec) C++ makefile
WXDIR = ..\..
EXTRALIBS=
TARGET=griddemo
include $(WXDIR)\src\makesc.env
griddemo.exe: griddemo.obj $(DEFFILE) griddemo.res
*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
*$(RC) -k griddemo.res
sc32.def:
echo EXETYPE NT > sc32.def
echo SUBSYSTEM WINDOWS >> sc32.def
sc16.def:
echo NAME $(TARGET) > sc16.def
echo EXETYPE WINDOWS >> sc16.def
echo STUB 'WINSTUB.EXE' >> sc16.def
echo CODE PRELOAD MOVEABLE DISCARDABLE >> sc16.def
echo DATA PRELOAD MOVEABLE MULTIPLE >> sc16.def
echo HEAPSIZE 1024 >> sc16.def
echo STACKSIZE 8192 >> sc16.def
clean:
-del *.obj
-del *.exe
-del *.res
-del *.map
-del *.rws
-del sc32.def
-del sc16.def
OBJECTS= $(TARGET).obj
include $(WXDIR)\src\makeprog.sc

88
src/generic/gridsel.cpp
View File

@@ -222,7 +222,7 @@ void wxGridSelection::SelectRow( int row,
m_blockSelectionTopLeft.RemoveAt(n);
m_blockSelectionBottomRight.RemoveAt(n);
n--; count--;
}
}
else if ( coords1.GetCol() == 0 &&
coords2.GetCol() == m_grid->GetNumberCols() - 1 )
{
@@ -239,7 +239,7 @@ void wxGridSelection::SelectRow( int row,
{
coords2.SetRow(row);
done = TRUE;
}
}
}
}
@@ -332,7 +332,7 @@ void wxGridSelection::SelectCol( int col,
{
coords2.SetCol(col);
done = TRUE;
}
}
}
}
@@ -373,7 +373,7 @@ void wxGridSelection::SelectCol( int col,
void wxGridSelection::SelectBlock( int topRow, int leftCol,
int bottomRow, int rightCol,
bool ControlDown, bool ShiftDown,
bool AltDown, bool MetaDown,
bool AltDown, bool MetaDown,
bool sendEvent )
{
// Fix the coordinates of the block if needed.
@@ -477,7 +477,7 @@ void wxGridSelection::SelectBlock( int topRow, int leftCol,
for ( n = 0; n < count; n++ )
{
switch ( BlockContain( 0, m_colSelection[n],
m_grid->GetNumberRows()-1, m_colSelection[n],
m_grid->GetNumberRows()-1, m_colSelection[n],
topRow, leftCol, bottomRow, rightCol ) )
{
case 1:
@@ -549,7 +549,7 @@ void wxGridSelection::SelectCell( int row, int col,
m_grid,
wxGridCellCoords( row, col ),
wxGridCellCoords( row, col ),
TRUE,
TRUE,
ControlDown, ShiftDown,
AltDown, MetaDown);
m_grid->GetEventHandler()->ProcessEvent(gridEvt);
@@ -779,7 +779,7 @@ void wxGridSelection::ClearSelection()
// deselect all invidiual cells and update the screen
if ( m_selectionMode == wxGrid::wxGridSelectCells )
{
while( ( n = m_cellSelection.GetCount() ) > 0)
{
wxRect r;
@@ -802,7 +802,7 @@ void wxGridSelection::ClearSelection()
m_blockSelectionTopLeft.RemoveAt(n);
m_blockSelectionBottomRight.RemoveAt(n);
if ( !m_grid->GetBatchCount() )
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
}
// deselect all rows and update the screen
@@ -817,7 +817,7 @@ void wxGridSelection::ClearSelection()
wxGridCellCoords( row, m_grid->GetNumberCols() - 1 ) );
m_rowSelection.RemoveAt(n);
if ( !m_grid->GetBatchCount() )
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
}
}
@@ -833,7 +833,7 @@ void wxGridSelection::ClearSelection()
wxGridCellCoords( m_grid->GetNumberRows() - 1, col ) );
m_colSelection.RemoveAt(n);
if ( !m_grid->GetBatchCount() )
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
((wxWindow *)m_grid->m_gridWin)->Refresh( FALSE, &r );
}
}
@@ -910,7 +910,7 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
coords2.SetRow(row2 + numRows);
if ( (size_t) row1 >= pos)
coords1.SetRow( wxMax(row1 + numRows, (int) pos) );
}
else
{
@@ -931,33 +931,35 @@ void wxGridSelection::UpdateRows( size_t pos, int numRows )
count = m_rowSelection.GetCount();
for ( n = 0; n < count; n++ )
{
int & rowOrCol = m_rowSelection[n];
if ( (size_t)rowOrCol >= pos )
{
if ( numRows > 0 )
{
// If rows inserted, include row counter where necessary
rowOrCol += numRows;
}
else if ( numRows < 0)
{
// If rows deleted, either decrement row counter (if row still exists)
if ((size_t)rowOrCol >= pos - numRows)
rowOrCol += numRows;
else
{
m_rowSelection.RemoveAt(n);
n--; count--;
}
}
}
int rowOrCol_ = m_rowSelection [ n ];
if ( ( size_t ) rowOrCol_ >= pos )
{
if ( numRows > 0 )
{
m_rowSelection [ n ] += numRows;
}
else if ( numRows < 0 )
{
if ( ( size_t ) rowOrCol_ >= ( pos - numRows ) )
m_rowSelection [ n ] += numRows;
else
{
m_rowSelection.RemoveAt ( n );
n--;
count--;
}
}
}
}
// No need to touch selected columns, unless we removed _all_
// rows, in this case, we remove all columns from the selection.
if ( !m_grid->GetNumberRows() )
m_colSelection.Clear();
}
void wxGridSelection::UpdateCols( size_t pos, int numCols )
{
size_t count = m_cellSelection.GetCount();
@@ -1016,7 +1018,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
coords2.SetCol(col2 + numCols);
if ( (size_t) col1 >= pos)
coords1.SetCol( wxMax(col1 + numCols, (int) pos) );
}
else
{
@@ -1037,23 +1039,20 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
count = m_colSelection.GetCount();
for ( n = 0; n < count; n++ )
{
int & rowOrCol = m_colSelection[n];
if ( (size_t)rowOrCol >= pos )
int rowOrCol = m_colSelection [ n ];
if ( ( size_t ) rowOrCol >= pos )
{
if ( numCols > 0 )
m_colSelection [ n ] += numCols;
else if ( numCols < 0 )
{
// If cols inserted, include col counter where necessary
rowOrCol += numCols;
}
else if ( numCols < 0)
{
// If cols deleted, either decrement col counter (if col still exists)
if ((size_t)rowOrCol >= pos - numCols)
rowOrCol += numCols;
if ( ( size_t ) rowOrCol >= ( pos -numCols ) )
m_colSelection [ n ] += numCols;
else
{
m_colSelection.RemoveAt(n);
n--; count--;
m_colSelection.RemoveAt ( n );
n--;
count--;
}
}
}
@@ -1065,6 +1064,7 @@ void wxGridSelection::UpdateCols( size_t pos, int numCols )
m_rowSelection.Clear();
}
int wxGridSelection::BlockContain( int topRow1, int leftCol1,
int bottomRow1, int rightCol1,
int topRow2, int leftCol2,