Solved wxMotif scrolling display problem; added wxImageModule;
added wxRETAINED support in wxMotif; changed wxDC::SetBackground behaviour; changed OnKeyDown/OnChar behaviour; fixed wxToolBar toggle bugs; fixed wxImage on wxMotif bug whereby new was used to allocate XImage data git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -538,10 +538,11 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
|
||||
{
|
||||
if (!display) /* Must be called first with non-NULL display */
|
||||
return m_mainColormap;
|
||||
|
||||
int defaultScreen = DefaultScreen((Display*) display);
|
||||
Screen* screen = XScreenOfDisplay((Display*) display, defaultScreen);
|
||||
|
||||
Colormap c =
|
||||
DefaultColormapOfScreen(XScreenOfDisplay((Display*) display,
|
||||
DefaultScreen((Display*) display)));
|
||||
Colormap c = DefaultColormapOfScreen(screen);
|
||||
|
||||
if (!m_mainColormap)
|
||||
m_mainColormap = (WXColormap) c;
|
||||
|
Reference in New Issue
Block a user