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

Exported a few more things for DLL builds.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-04-02 03:27:55 +00:00
parent 73830147df
commit 4d350ff2ca
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,6 +298,8 @@ public:
wxGridCellEditor(); wxGridCellEditor();
bool IsCreated() { return m_control != NULL; } bool IsCreated() { return m_control != NULL; }
wxControl* GetControl() { return m_control; }
void SetControl(wxControl* control) { m_control = control; }
// Creates the actual edit control // Creates the actual edit control
virtual void Create(wxWindow* parent, virtual void Create(wxWindow* parent,
@@ -933,8 +935,8 @@ private:
// For comparisons... // For comparisons...
// //
extern wxGridCellCoords wxGridNoCellCoords; extern WXDLLEXPORT wxGridCellCoords wxGridNoCellCoords;
extern wxRect wxGridNoCellRect; extern WXDLLEXPORT wxRect wxGridNoCellRect;
// An array of cell coords... // An array of cell coords...
// //
@@ -1356,7 +1358,7 @@ public:
int x, int y, int w = -1, int h = -1, int x, int y, int w = -1, int h = -1,
long style = wxWANTS_CHARS, long style = wxWANTS_CHARS,
const wxString& name = wxPanelNameStr ) const wxString& name = wxPanelNameStr )
: wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h), : wxScrolledWindow( parent, -1, wxPoint(x,y), wxSize(w,h),
(style|wxWANTS_CHARS), name ) (style|wxWANTS_CHARS), name )
{ {
Create(); Create();

14
src/generic/grid.cpp
View File

@@ -71,7 +71,7 @@
// array classes // array classes
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
WX_DEFINE_ARRAY(wxGridCellAttr *, wxArrayAttrs); WX_DEFINE_EXPORTED_ARRAY(wxGridCellAttr *, wxArrayAttrs);
struct wxGridCellWithAttr struct wxGridCellWithAttr
{ {
@@ -89,7 +89,7 @@ struct wxGridCellWithAttr
wxGridCellAttr *attr; wxGridCellAttr *attr;
}; };
WX_DECLARE_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray); WX_DECLARE_EXPORTED_OBJARRAY(wxGridCellWithAttr, wxGridCellWithAttrArray);
#include "wx/arrimpl.cpp" #include "wx/arrimpl.cpp"
@@ -293,7 +293,7 @@ struct wxGridDataTypeInfo
}; };
WX_DEFINE_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray); WX_DEFINE_EXPORTED_ARRAY(wxGridDataTypeInfo*, wxGridDataTypeInfoArray);
class WXDLLEXPORT wxGridTypeRegistry class WXDLLEXPORT wxGridTypeRegistry
@@ -2567,7 +2567,7 @@ bool wxGridStringTable::AppendRows( size_t numRows )
size_t row, col; size_t row, col;
size_t curNumRows = m_data.GetCount(); size_t curNumRows = m_data.GetCount();
size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() : size_t curNumCols = ( curNumRows > 0 ? m_data[0].GetCount() :
( GetView() ? GetView()->GetNumberCols() : 0 ) ); ( GetView() ? GetView()->GetNumberCols() : 0 ) );
wxArrayString sa; wxArrayString sa;
@@ -4808,7 +4808,7 @@ bool wxGrid::InsertRows( int pos, int numRows, bool WXUNUSED(updateLabels) )
m_gridWin->Refresh(); m_gridWin->Refresh();
} }
} }
return ok; return ok;
} }
else else
@@ -5051,7 +5051,7 @@ bool wxGrid::SendEvent( const wxEventType type,
} }
else if ( type == wxEVT_GRID_RANGE_SELECT ) else if ( type == wxEVT_GRID_RANGE_SELECT )
{ {
// Right now, it should _never_ end up here! // Right now, it should _never_ end up here!
wxGridRangeSelectEvent gridEvt( GetId(), wxGridRangeSelectEvent gridEvt( GetId(),
type, type,
this, this,
@@ -7757,7 +7757,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
{ {
int temp; int temp;
wxGridCellCoords updateTopLeft, updateBottomRight; wxGridCellCoords updateTopLeft, updateBottomRight;
if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows ) if ( m_selection->GetSelectionMode() == wxGrid::wxGridSelectRows )
{ {
leftCol = 0; leftCol = 0;