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

1. wxGrid fixes contributed by Gerhard Gruber (client data for cells...)

Browse Source 
2. Motif warnings removed
3. Using native msgbox under Motif (ok, it doesn't work, but generic doesn't
   work neither)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-29 13:13:11 +00:00
parent dfe1eee3bb
commit bf6c2b3505
8 changed files with 278 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/generic/gridg.h
View File

@@ -101,12 +101,16 @@ public:
void SetCellTextFont(const wxFont& fnt, int row, int col);
wxBitmap *GetCellBitmap(int row, int col) const;
void SetCellBitmap(wxBitmap *bitmap, int row, int col);
void *SetCellData(void *data, int row, int col);
void *GetCellData(int row, int col);
// Size accessors
void SetColumnWidth(int col, int width);
int GetColumnWidth(int col) const;
void SetRowHeight(int row, int height);
int GetRowHeight(int row) const;
int GetViewHeight() const { return m_viewHeight; }
int GetViewWidth() const { return m_viewWidth; }
// Label accessors
void SetLabelSize(int orientation, int sz);
@@ -266,6 +270,8 @@ protected:
int m_bottomOfSheet; // Calculated from m_rowHeights
int m_totalGridWidth; // Total 'virtual' size
int m_totalGridHeight;
int m_viewHeight; // Number of rows displayed
int m_viewWidth; // Number of columns displayed
int m_cellHeight; // For now, a default
int m_verticalLabelWidth;
int m_horizontalLabelHeight;
@@ -318,7 +324,8 @@ public:
wxColour backgroundColour;
wxBrush backgroundBrush;
wxBitmap* cellBitmap;
int alignment;
void* cellData; // intended for additional data associated with a cell
int alignment;
wxGridCell(wxGenericGrid *window = (wxGenericGrid *) NULL);
~wxGridCell();
@@ -337,6 +344,9 @@ public:
void SetAlignment(int align) { alignment = align; }
wxBitmap *GetCellBitmap() const { return cellBitmap; }
void SetCellBitmap(wxBitmap *bitmap) { cellBitmap = bitmap; }
void *SetCellData(void *data) { void *rc = cellData; cellData = data; return rc; }
void *GetCellData() const { return cellData; }
};
class WXDLLEXPORT wxGrid : public wxGenericGrid

2
include/wx/msgdlg.h
View File

@@ -4,7 +4,7 @@
#if defined(__WXMSW__)
#include "wx/msw/msgdlg.h"
#elif defined(__WXMOTIF__)
#include "wx/generic/msgdlgg.h"
#include "wx/motif/msgdlg.h"
#elif defined(__WXGTK__)
#include "wx/gtk/msgdlg.h"
#elif defined(__WXQT__)

102
src/generic/gridg.cpp
View File

@@ -5,6 +5,8 @@
// Modified by: Michael Bedward
// Added edit in place facility, 20 Apr 1999
// Added cursor key control, 29 Jun 1999
// Gerhard Gruber
// Added keyboard navigation, client data, other fixes
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
@@ -77,8 +79,10 @@ BEGIN_EVENT_TABLE(wxGenericGrid, wxPanel)
END_EVENT_TABLE()
wxGenericGrid::wxGenericGrid(void)
wxGenericGrid::wxGenericGrid()
{
m_viewWidth = 0;
m_viewHeight = 0;
m_batchCount = 0;
m_hScrollBar = (wxScrollBar *) NULL;
m_vScrollBar = (wxScrollBar *) NULL;
@@ -137,9 +141,15 @@ wxGenericGrid::wxGenericGrid(void)
m_textItem = (wxTextCtrl *) NULL;
}
bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
long style, const wxString& name)
bool wxGenericGrid::Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
long style,
const wxString& name)
{
m_viewWidth = 0;
m_viewHeight = 0;
m_batchCount = 0;
m_editingPanel = (wxPanel *) NULL;
m_hScrollBar = (wxScrollBar *) NULL;
@@ -246,12 +256,12 @@ bool wxGenericGrid::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos,
return TRUE;
}
wxGenericGrid::~wxGenericGrid(void)
wxGenericGrid::~wxGenericGrid()
{
ClearGrid();
}
void wxGenericGrid::ClearGrid(void)
void wxGenericGrid::ClearGrid()
{
int i,j;
if (m_gridCells)
@@ -380,7 +390,7 @@ bool wxGenericGrid::CreateGrid(int nRows, int nCols, wxString **cellValues, shor
}
// Need to determine various dimensions
void wxGenericGrid::UpdateDimensions(void)
void wxGenericGrid::UpdateDimensions()
{
int canvasWidth, canvasHeight;
GetSize(&canvasWidth, &canvasHeight);
@@ -941,7 +951,7 @@ void wxGenericGrid::DrawCellValue(wxDC *dc, wxRect *rect, int row, int col)
}
}
void wxGenericGrid::AdjustScrollbars(void)
void wxGenericGrid::AdjustScrollbars()
{
int cw, ch;
GetClientSize(&cw, &ch);
@@ -966,56 +976,53 @@ void wxGenericGrid::AdjustScrollbars(void)
int noHorizSteps = 0;
int noVertSteps = 0;
if (m_totalGridWidth + vertScrollBarWidth <= cw)
noHorizSteps = 0;
else
if (m_totalGridWidth + vertScrollBarWidth > cw)
{
noHorizSteps = 0;
int widthCount = 0;
int i;
int nx = 0;
int nx = 0;
for (i = m_scrollPosX ; i < m_totalCols; i++)
{
widthCount += m_colWidths[i];
// A partial bit doesn't count, we still have to scroll to see the
// rest of it
// A partial bit doesn't count, we still have to scroll to see the
// rest of it
if (widthCount + m_leftOfSheet + m_verticalLabelWidth > (cw-vertScrollBarWidth))
break;
else
nx ++;
else
nx ++;
}
noHorizSteps += nx;
}
if (m_totalGridHeight + horizScrollBarHeight <= ch)
noVertSteps = 0;
else
m_viewWidth = noHorizSteps;
if (m_totalGridHeight + horizScrollBarHeight > ch)
{
noVertSteps = 0;
int heightCount = 0;
int i;
int ny = 0;
int ny = 0;
for (i = m_scrollPosY ; i < m_totalRows; i++)
{
heightCount += m_rowHeights[i];
// A partial bit doesn't count, we still have to scroll to see the
// rest of it
// A partial bit doesn't count, we still have to scroll to see the
// rest of it
if (heightCount + m_topOfSheet + m_horizontalLabelHeight > (ch-horizScrollBarHeight))
break;
else
ny ++;
else
ny ++;
}
noVertSteps += ny;
}
m_viewHeight = noVertSteps;
if (m_totalGridWidth + vertScrollBarWidth <= cw)
{
if ( m_hScrollBar )
m_hScrollBar->Show(FALSE);
if ( m_hScrollBar )
m_hScrollBar->Show(FALSE);
SetScrollPosX(0);
}
else
@@ -1479,12 +1486,12 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
GetEventHandler()->ProcessEvent(g_evt2);
}
wxGridCell *wxGenericGrid::OnCreateCell(void)
wxGridCell *wxGenericGrid::OnCreateCell()
{
return new wxGridCell(this);
}
void wxGenericGrid::OnChangeLabels(void)
void wxGenericGrid::OnChangeLabels()
{
char buf[100];
int i;
@@ -1510,7 +1517,7 @@ void wxGenericGrid::OnChangeLabels(void)
}
}
void wxGenericGrid::OnChangeSelectionLabel(void)
void wxGenericGrid::OnChangeSelectionLabel()
{
if (!GetEditable())
return;
@@ -1553,7 +1560,7 @@ void wxGenericGrid::HighlightCell(wxDC *dc)
dc->SetLogicalFunction(wxCOPY);
}
void wxGenericGrid::DrawCellText(void)
void wxGenericGrid::DrawCellText()
{
if (!m_currentRectVisible)
return;
@@ -2510,9 +2517,9 @@ void wxGenericGrid::SetGridCursor(int row, int col)
dc.EndDrawing();
}
/*
* Grid cell
*/
// ----------------------------------------------------------------------------
// Grid cell
// ----------------------------------------------------------------------------
wxGridCell::wxGridCell(wxGenericGrid *window)
{
@@ -2539,9 +2546,11 @@ wxGridCell::wxGridCell(wxGenericGrid *window)
alignment = window->GetCellAlignment();
else
alignment = wxLEFT;
cellData = (void *)NULL;
}
wxGridCell::~wxGridCell(void)
wxGridCell::~wxGridCell()
{
}
@@ -2741,4 +2750,25 @@ void wxGenericGrid::_OnLabelRightClick(wxGridEvent& ev)
OnLabelRightClick(ev.m_row, ev.m_col, ev.m_x, ev.m_y, ev.m_control, ev.m_shift);
}
void *wxGenericGrid::SetCellData(void *data, int row, int col)
{
void *rc = NULL;
wxGridCell *cell = GetCell(row, col);
if ( cell )
rc = cell->SetCellData(data);
return rc;
}
void *wxGenericGrid::GetCellData(int row, int col)
{
void *rc = NULL;
wxGridCell *cell = GetCell(row, col);
if ( cell )
rc = cell->GetCellData();
return rc;
}

2
src/motif/Makefile.am
View File

@@ -118,7 +118,6 @@ libwx_motif_la_SOURCES = \
imaglist.cpp \
laywin.cpp \
listctrl.cpp \
msgdlgg.cpp \
panelg.cpp \
printps.cpp \
prntdlgg.cpp \
@@ -170,6 +169,7 @@ libwx_motif_la_SOURCES = \
menu.cpp \
menuitem.cpp \
minifram.cpp \
msgdlg.cpp \
notebook.cpp \
palette.cpp \
pen.cpp \

10
src/motif/menu.cpp
View File

@@ -6,7 +6,7 @@
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -138,7 +138,7 @@ void wxMenu::Append(wxMenuItem *pItem)
m_menuItems.Append(pItem);
if (m_menuWidget)
pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append
pItem->CreateItem (m_menuWidget, m_menuBar, m_topLevelMenu); // this is a dynamic Append
m_noItems++;
}
@@ -444,8 +444,6 @@ bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
menu->DestroyMenu(TRUE);
}
wxWindow *parent = this;
menu->SetId(1); /* Mark as popped-up */
menu->CreateMenu(NULL, widget, menu);
menu->SetInvokingWindow(this);
@@ -1009,7 +1007,7 @@ void wxMenu::DestroyMenu (bool full)
item->SetMenuBar((wxMenuBar*) NULL);
item->DestroyItem(full);
} // for()
}// for()
if (m_buttonWidget)
{
@@ -1054,7 +1052,7 @@ WXWidget wxMenu::FindMenuItem (int id, wxMenuItem ** it) const
return w;
}
}
} // for()
}// for()
if (it)
*it = (wxMenuItem*) NULL;

3
src/motif/palette.cpp
View File

@@ -6,7 +6,7 @@
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/*
@@ -71,7 +71,6 @@ wxPaletteRefData::wxPaletteRefData()
wxPaletteRefData::~wxPaletteRefData()
{
XColor xcol;
Display *display = (Display*) NULL;
wxNode *node, *next;

39
src/motif/toolbar.cpp
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
@@ -36,7 +36,7 @@ END_EVENT_TABLE()
#endif
static void wxToolButtonCallback (Widget w, XtPointer clientData,
XtPointer ptr);
XtPointer ptr);
static void wxToolButtonPopupCallback (Widget w, XtPointer client_data,
XEvent *event, Boolean *continue_to_dispatch);
@@ -161,12 +161,12 @@ bool wxToolBar::CreateTools()
button = XtVaCreateWidget("toggleButton",
xmToggleButtonWidgetClass, (Widget) m_mainWidget,
XmNx, currentX, XmNy, currentY,
// XmNpushButtonEnabled, True,
// XmNpushButtonEnabled, True,
XmNmultiClick, XmMULTICLICK_KEEP,
XmNlabelType, XmPIXMAP,
NULL);
XtAddCallback ((Widget) button, XmNvalueChangedCallback, (XtCallbackProc) wxToolButtonCallback,
(XtPointer) this);
(XtPointer) this);
XtVaSetValues ((Widget) button,
XmNselectColor, m_backgroundColour.AllocColour(XtDisplay((Widget) button)),
@@ -198,7 +198,7 @@ bool wxToolBar::CreateTools()
{
int backgroundPixel;
XtVaGetValues(button, XmNbackground, &backgroundPixel,
NULL);
NULL);
wxColour col;
@@ -214,10 +214,10 @@ bool wxToolBar::CreateTools()
int backgroundPixel;
if (tool->m_isToggle)
XtVaGetValues(button, XmNselectColor, &backgroundPixel,
NULL);
NULL);
else
XtVaGetValues(button, XmNarmColor, &backgroundPixel,
NULL);
NULL);
wxColour col;
col.SetPixel(backgroundPixel);
@@ -235,7 +235,7 @@ bool wxToolBar::CreateTools()
{
wxBitmap newBitmap = wxCreateMaskedBitmap(originalBitmap, col);
tool->m_bitmap2 = newBitmap;
}
}
else
tool->m_bitmap2 = tool->m_bitmap1;
}
@@ -264,11 +264,11 @@ bool wxToolBar::CreateTools()
}
XtVaSetValues (button,
XmNindicatorOn, False,
XmNshadowThickness, 2,
// XmNborderWidth, 0,
// XmNspacing, 0,
XmNmarginWidth, 0,
XmNmarginHeight, 0,
XmNshadowThickness, 2,
// XmNborderWidth, 0,
// XmNspacing, 0,
XmNmarginWidth, 0,
XmNmarginHeight, 0,
XmNfillOnSelect, True,
XmNlabelPixmap, pixmap,
XmNselectPixmap, pixmap2,
@@ -303,7 +303,7 @@ bool wxToolBar::CreateTools()
Dimension width, height;
XtVaGetValues(button, XmNwidth, & width, XmNheight, & height,
NULL);
NULL);
currentX += width + marginX;
buttonHeight = wxMax(buttonHeight, height);
@@ -471,7 +471,7 @@ WXWidget wxToolBar::GetMainWidget() const
void wxToolButtonCallback (Widget w, XtPointer clientData,
XtPointer ptr)
XtPointer ptr)
{
wxToolBar *toolBar = (wxToolBar *) clientData;
int index = toolBar->FindIndexForWidget((WXWidget) w);
@@ -505,7 +505,6 @@ static void wxToolButtonPopupCallback (Widget w, XtPointer client_data,
wxNode *node = toolBar->GetTools().Find((long)index);
if (!node)
return;
wxToolBarTool *tool = (wxToolBarTool *)node->Data();
wxString str(toolBar->GetToolShortHelp(index));
if (str.IsNull() || str == "")
return;
@@ -513,8 +512,8 @@ static void wxToolButtonPopupCallback (Widget w, XtPointer client_data,
if (!wxTheToolBarTimer)
wxTheToolBarTimer = new wxToolBarTimer;
wxToolBarTimer::buttonWidget = w;
wxToolBarTimer::helpString = str;
wxToolBarTimer::buttonWidget = w;
wxToolBarTimer::helpString = str;
/************************************************************/
@@ -526,7 +525,7 @@ static void wxToolButtonPopupCallback (Widget w, XtPointer client_data,
{
XtDestroyWidget (wxToolBarTimer::help_popup);
XtPopdown (wxToolBarTimer::help_popup);
}
}
wxToolBarTimer::help_popup = (Widget) 0;
// One shot
@@ -544,7 +543,7 @@ static void wxToolButtonPopupCallback (Widget w, XtPointer client_data,
{
XtDestroyWidget (wxToolBarTimer::help_popup);
XtPopdown (wxToolBarTimer::help_popup);
}
}
wxToolBarTimer::help_popup = (Widget) 0;
}
}

2
src/motif/utils.cpp
View File

@@ -75,7 +75,7 @@ void wxFlushEvents()
Display *display = (Display*) wxGetDisplay();
XSync (display, FALSE);
XEvent event;
// XtAppPending returns availability of events AND timers/inputs, which
// are processed via callbacks, so XtAppNextEvent will not return if
// there are no events. So added '& XtIMXEvent' - Sergey.