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

OS/2 loads bitmap resources via integer ID, not via a string filename

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-08 03:41:27 +00:00
parent 3029781e1d
commit dc4211aa0c
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/cshelp.cpp
View File

@@ -170,7 +170,7 @@ bool wxContextHelp::EndContextHelp()
bool wxContextHelp::EventLoop() bool wxContextHelp::EventLoop()
{ {
m_inHelp = TRUE; m_inHelp = TRUE;
while ( m_inHelp ) while ( m_inHelp )
{ {
if (wxTheApp->Pending()) if (wxTheApp->Pending())
@@ -182,7 +182,7 @@ bool wxContextHelp::EventLoop()
wxTheApp->ProcessIdle(); wxTheApp->ProcessIdle();
} }
} }
return TRUE; return TRUE;
} }
@@ -225,9 +225,9 @@ bool wxContextHelp::DispatchEvent(wxWindow* win, const wxPoint& pt)
{ {
wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ; wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), pt) ;
helpEvent.SetEventObject(this); helpEvent.SetEventObject(this);
eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent); eventProcessed = win->GetEventHandler()->ProcessEvent(helpEvent);
// Go up the window hierarchy until the event is handled (or not). // Go up the window hierarchy until the event is handled (or not).
// I.e. keep submitting ancestor windows until one is recognised // I.e. keep submitting ancestor windows until one is recognised
// by the app code that processes the ids and displays help. // by the app code that processes the ids and displays help.
@@ -275,8 +275,15 @@ wxContextHelpButton::wxContextHelpButton(wxWindow* parent,
const wxPoint& pos, const wxPoint& pos,
const wxSize& size, const wxSize& size,
long style) long style)
#if defined(__WXPM__)
: wxBitmapButton(parent, id, wxBitmap(wxCSQUERY_BITMAP
,wxBITMAP_TYPE_RESOURCE
),
pos, size, style)
#else
: wxBitmapButton(parent, id, wxBITMAP(csquery), : wxBitmapButton(parent, id, wxBITMAP(csquery),
pos, size, style) pos, size, style)
#endif
{ {
} }

11
src/common/resource.cpp
View File

@@ -335,7 +335,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
((wxItemResource*) childResource)->SetBitmap(bitmap); ((wxItemResource*) childResource)->SetBitmap(bitmap);
} }
if (!bitmap.Ok()) if (!bitmap.Ok())
#if defined(__WXPM__)
//
// OS/2 uses integer id's to access resources, not file name strings
//
bitmap.LoadFile(wxCROSS_BITMAP, wxBITMAP_TYPE_BMP_RESOURCE);
#else
bitmap.LoadFile("cross_bmp", wxBITMAP_TYPE_BMP_RESOURCE); bitmap.LoadFile("cross_bmp", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
control = new wxBitmapButton(parent, id, bitmap, pos, size, control = new wxBitmapButton(parent, id, bitmap, pos, size,
childResource->GetStyle() | wxBU_AUTODRAW, wxDefaultValidator, childResource->GetName()); childResource->GetStyle() | wxBU_AUTODRAW, wxDefaultValidator, childResource->GetName());
} }
@@ -2477,7 +2484,11 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
} }
default: default:
{ {
#if defined(__WXPM__)
return wxNullBitmap;
#else
return wxBitmap(name, (wxBitmapType)bitmapType); return wxBitmap(name, (wxBitmapType)bitmapType);
#endif
} }
} }
#ifndef __WXGTK__ #ifndef __WXGTK__