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

Toolbar updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-08 03:39:59 +00:00
parent b6f4144e59
commit 3029781e1d
5 changed files with 254 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/os2/bitmap.cpp
View File

@@ -295,12 +295,12 @@ wxBitmap::wxBitmap(
} // end of wxBitmap::wxBitmap
wxBitmap::wxBitmap(
const wxString& rFilename
int nId
, long lType
)
{
Init();
LoadFile( rFilename
LoadFile( nId
,(int)lType
);
} // end of wxBitmap::wxBitmap
@@ -411,7 +411,7 @@ bool wxBitmap::CreateFromXpm(
} // end of wxBitmap::CreateFromXpm
bool wxBitmap::LoadFile(
const wxString& rFilename
int nId
, long lType
)
{
@@ -428,8 +428,7 @@ bool wxBitmap::LoadFile(
m_refData = new wxBitmapRefData;
return(pHandler->LoadFile( this
,rFilename
,hPs
,nId
,lType
, -1
, -1
@@ -437,14 +436,7 @@ bool wxBitmap::LoadFile(
}
else
{
wxImage vImage;
if (!vImage.LoadFile(rFilename, lType) || !vImage.Ok() )
return(FALSE);
*this = wxBitmap(vImage);
return(TRUE);
}
} // end of wxBitmap::LoadFile
@@ -1481,8 +1473,7 @@ bool wxBitmapHandler::Create(
bool wxBitmapHandler::Load(
wxGDIImage* pImage
, const wxString& rName
, HPS hPs
, int nId
, long lFlags
, int nWidth
, int nHeight
@@ -1493,8 +1484,7 @@ bool wxBitmapHandler::Load(
);
return(pBitmap ? LoadFile( pBitmap
,rName
,hPs
,nId
,lFlags
,nWidth
,nHeight
@@ -1531,8 +1521,7 @@ bool wxBitmapHandler::Create(
bool wxBitmapHandler::LoadFile(
wxBitmap* WXUNUSED(pBitmap)
, const wxString& WXUNUSED(rName)
, HPS WXUNUSED(hPs)
, int WXUNUSED(nId)
, long WXUNUSED(lType)
, int WXUNUSED(nDesiredWidth)
, int WXUNUSED(nDesiredHeight)

113
src/os2/gdiimage.cpp
View File

@@ -62,6 +62,20 @@ public:
);
private:
inline virtual bool LoadFile( wxBitmap* pBitmap
,int nId
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
)
{
return wxBitmapHandler::LoadFile( pBitmap
,nId
,lFlags
,nDesiredWidth
,nDesiredHeight
);
}
DECLARE_DYNAMIC_CLASS(wxBMPFileHandler)
};
@@ -75,8 +89,7 @@ public:
}
virtual bool LoadFile( wxBitmap* pBitmap
,const wxString& rName
,HPS hPs
,int nId
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
@@ -146,6 +159,16 @@ protected:
,int nDesiredWidth = -1
,int nDesiredHeight = -1
) = 0;
private:
inline virtual bool Load( wxGDIImage* pImage
,int nId
,long lFlags
,int nDesiredWidth
,int nDesiredHeight
)
{
return FALSE;
}
};
class WXDLLEXPORT wxICOFileHandler : public wxIconHandler
@@ -354,43 +377,39 @@ void wxGDIImage::InitStandardHandlers()
bool wxBMPResourceHandler::LoadFile(
wxBitmap* pBitmap
, const wxString& rName
, HPS hPs
, int nId
, long lFlags
, int nDesiredWidth
, int nDesiredHeight
)
{
// TODO: load a bitmap from a file
/*
rBitmap->SetHBITMAP((WXHBITMAP)::LoadBitmap(wxGetInstance(), rName));
SIZEL vSize = {0, 0};
DEVOPENSTRUC vDop = {0L, "DISPLAY", NULL, 0L, 0L, 0L, 0L, 0L, 0L};
HDC hDC = ::DevOpenDC(vHabmain, OD_MEMORY, "*", 5L, (PDEVOPENDATA)&vDop, NULLHANDLE);
HPS hPS = ::GpiCreatePS(vHabmain, hDC, &vSize, PU_PELS | GPIA_ASSOC);
wxBitmapRefData* pData = bitmap->GetBitmapData();
pBitmap->SetHBITMAP((WXHBITMAP)::GpiLoadBitmap( hPS
,NULLHANDLE
,nId
,0
,0
));
::GpiDestroyPS(hPS);
::DevCloseDC(hDC);
wxBitmapRefData* pData = pBitmap->GetBitmapData();
if ( pBitmap->Ok() )
{
BITMAP bm;
BITMAPINFOHEADER vBmph;
if ( !::GetObject(GetHbitmapOf(*pBitmap), sizeof(BITMAP), (LPSTR) &bm) )
{
wxLogLastError("GetObject(HBITMAP)");
}
data->m_width = bm.bmWidth;
data->m_height = bm.bmHeight;
data->m_depth = bm.bmBitsPixel;
}
else
{
// it's probably not found
wxLogError(wxT("Can't load bitmap '%s' from resources! Check .rc file."),
name.c_str());
}
return bitmap->Ok();
*/
return(FALSE);
::GpiQueryBitmapParameters(GetHbitmapOf(*pBitmap), &vBmph);
pData->m_nWidth = vBmph.cx;
pData->m_nHeight = vBmph.cy;
pData->m_nDepth = vBmph.cBitCount;
}
return(pBitmap->Ok());
} // end of wxBMPResourceHandler::LoadFile
bool wxBMPFileHandler::LoadFile(
wxBitmap* pBitmap
@@ -463,44 +482,6 @@ bool wxICOFileHandler::LoadIcon(
// actual size
wxSize vSize;
// TODO: load icon directly from a file
/*
#ifdef __WIN32__
HICON hicon = ::ExtractIcon(wxGetInstance(), name, first);
if ( !hicon )
{
wxLogSysError(_T("Failed to load icon from the file '%s'"),
name.c_str());
return FALSE;
}
size = GetHiconSize(hicon);
#else // Win16
HICON hicon = ReadIconFile((wxChar *)name.c_str(),
wxGetInstance(),
&size.x, &size.y);
#endif // Win32/Win16
if ( (desiredWidth != -1 && desiredWidth != size.x) ||
(desiredHeight != -1 && desiredHeight != size.y) )
{
wxLogDebug(_T("Returning FALSE from wxICOFileHandler::Load because "
"of the size mismatch: actual (%d, %d), "
"requested (%d, %d)"),
size.x, size.y,
desiredWidth, desiredHeight);
::DestroyIcon(hicon);
return FALSE;
}
icon->SetHICON((WXHICON)hicon);
icon->SetSize(size.x, size.y);
return icon->Ok();
*/
return(FALSE);
#else
return(FALSE);

3
src/os2/makefile.va
View File

@@ -519,7 +519,6 @@ OS2OBJS = \
..\os2\$D\ownerdrw.obj \
..\os2\$D\palette.obj \
..\os2\$D\pen.obj \
..\os2\$D\pnghand.obj \
..\os2\$D\popupwin.obj \
..\os2\$D\print.obj \
..\os2\$D\radiobox.obj \
@@ -603,7 +602,6 @@ OS2LIBOBJS2 = \
ownerdrw.obj \
palette.obj \
pen.obj \
pnghand.obj \
popupwin.obj \
print.obj \
radiobox.obj \
@@ -962,7 +960,6 @@ $(OS2LIBOBJS2):
copy ..\os2\$D\ownerdrw.obj
copy ..\os2\$D\palette.obj
copy ..\os2\$D\pen.obj
copy ..\os2\$D\pnghand.obj
copy ..\os2\$D\popupwin.obj
copy ..\os2\$D\print.obj
copy ..\os2\$D\radiobox.obj

173
src/os2/toolbar.cpp
View File

@@ -228,7 +228,10 @@ wxBitmap wxDisableBitmap(
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
}
vNewBmp.SetMask(rBmp.GetMask());
wxMask* pNewMask;
pNewMask = new wxMask(pMask->GetMaskBitmap());
vNewBmp.SetMask(pNewMask);
free(pucBits);
::GpiSetBitmap(hPS, NULLHANDLE);
::GpiDestroyPS(hPS);
@@ -396,6 +399,92 @@ wxToolBarToolBase* wxToolBar::DoAddTool(
);
} // end of wxToolBar::DoAddTool
bool wxToolBar::DeleteTool(
int nId
)
{
bool bOk = wxToolBarBase::DeleteTool(nId);
if (bOk)
{
Realize();
}
return bOk;
} // end of wxToolBar::DeleteTool
bool wxToolBar::DeleteToolByPos(
size_t nPos
)
{
bool bOk = wxToolBarBase::DeleteToolByPos(nPos);
if (bOk)
{
Realize();
}
return bOk;
} // end of wxToolBar::DeleteTool
wxToolBarToolBase* wxToolBar::InsertControl(
size_t nPos
, wxControl* pControl
)
{
wxToolBarToolBase* pTool = wxToolBarBase::InsertControl( nPos
,pControl
);
if (m_bInitialized)
{
Realize();
Refresh();
}
return pTool;
} // end of wxToolBar::InsertControl
wxToolBarToolBase* wxToolBar::InsertSeparator(
size_t nPos
)
{
wxToolBarToolBase* pTool = wxToolBarBase::InsertSeparator(nPos);
if (m_bInitialized)
{
Realize();
Refresh();
}
return pTool;
} // end of wxToolBar::InsertSeparator
wxToolBarToolBase* wxToolBar::InsertTool(
size_t nPos
, int nId
, const wxString& rsLabel
, const wxBitmap& rBitmap
, const wxBitmap& rBmpDisabled
, wxItemKind eKind
, const wxString& rsShortHelp
, const wxString& rsLongHelp
, wxObject* pClientData
)
{
wxToolBarToolBase* pTool = wxToolBarBase::InsertTool( nPos
,nId
,rsLabel
,rBitmap
,rBmpDisabled
,eKind
,rsShortHelp
,rsLongHelp
,pClientData
);
if (m_bInitialized)
{
Realize();
Refresh();
}
return pTool;
} // end of wxToolBar::InsertTool
bool wxToolBar::DoInsertTool(
size_t WXUNUSED(nPos)
, wxToolBarToolBase* pToolBase
@@ -511,7 +600,7 @@ bool wxToolBar::Create(
if (nHeight <= 0)
{
if (lStyle & wxTB_TEXT)
nHeight = m_defaultHeight + 18;
nHeight = m_defaultHeight + m_vTextY;
else
nHeight = m_defaultHeight;
}
@@ -575,6 +664,9 @@ bool wxToolBar::Realize()
//
// Set the height according to the font and the border size
//
if (pTool->GetWidth() > m_vTextX)
nMaxToolWidth = pTool->GetWidth() + 4;
else
nMaxToolWidth = m_vTextX;
if (pTool->GetHeight() + m_vTextY > nMaxToolHeight)
nMaxToolHeight = pTool->GetHeight() + m_vTextY;
@@ -582,13 +674,35 @@ bool wxToolBar::Realize()
else
{
if (pTool->GetWidth() > nMaxToolWidth )
nMaxToolWidth = pTool->GetWidth();
nMaxToolWidth = pTool->GetWidth() + 4;
if (pTool->GetHeight() > nMaxToolHeight)
nMaxToolHeight = pTool->GetHeight();
}
pNode = pNode->GetNext();
}
wxCoord vTbWidth = 0L;
wxCoord vTbHeight = 0L;
GetSize( &vTbWidth
,&vTbHeight
);
if (vTbHeight < nMaxToolHeight)
{
SetSize( -1L
,-1L
,vTbWidth
,nMaxToolHeight + 4
);
if (GetParent()->IsKindOf(CLASSINFO(wxFrame)))
{
wxFrame* pFrame = wxDynamicCast(GetParent(), wxFrame);
if (pFrame)
pFrame->PositionToolBar();
}
}
int nSeparatorSize = m_toolSeparation;
pNode = m_tools.GetFirst();
@@ -605,7 +719,7 @@ bool wxToolBar::Realize()
if (m_nCurrentRowsOrColumns >= m_maxCols)
m_vLastY += nSeparatorSize;
else
m_vLastX += nSeparatorSize;
m_vLastX += nSeparatorSize * 4;
}
else
{
@@ -614,7 +728,7 @@ bool wxToolBar::Realize()
if (m_nCurrentRowsOrColumns >= m_maxRows)
m_vLastX += nSeparatorSize;
else
m_vLastY += nSeparatorSize;
m_vLastY += nSeparatorSize * 4;
}
}
else if (pTool->IsButton())
@@ -671,6 +785,7 @@ bool wxToolBar::Realize()
m_maxWidth += m_xMargin;
m_maxHeight += m_yMargin;
m_bInitialized = TRUE;
return TRUE;
} // end of wxToolBar::Realize
@@ -781,7 +896,7 @@ void wxToolBar::OnMouseEvent(
if (rEvent.LeftIsDown())
SpringUpButton(m_nCurrentTool);
pTool = (wxToolBarTool *)FindById(m_nCurrentTool);
if (pTool && pTool->IsToggled())
if (pTool && !pTool->IsToggled())
{
RaiseTool( pTool
,FALSE
@@ -809,6 +924,12 @@ void wxToolBar::OnMouseEvent(
}
DrawTool(pTool);
}
wxToolBarTool* pOldTool = (wxToolBarTool*)FindById(m_nCurrentTool);
if (pOldTool && !pTool->IsToggled())
RaiseTool( pOldTool
,FALSE
);
m_nCurrentTool = pTool->GetId();
OnMouseEnter(m_nCurrentTool);
if (!pTool->IsToggled())
@@ -948,6 +1069,17 @@ void wxToolBar::DrawTool(
,&vX
,&vY
);
if (pTool->GetWidth() > vX) // large tools
{
vLeft = pTool->m_vX + (pTool->GetWidth() - vX);
GetSize(&vX, &vY);
rDc.DrawText( pTool->GetLabel()
,vLeft
,vY - (m_vTextY - 2)
);
}
else // normal tools
{
vLeft += (wxCoord)((m_vTextX - vX)/2);
rDc.DrawText( pTool->GetLabel()
,vLeft
@@ -955,6 +1087,7 @@ void wxToolBar::DrawTool(
);
}
}
}
else
{
wxColour vColor("GREY");
@@ -1013,6 +1146,10 @@ wxToolBarToolBase* wxToolBar::FindToolForPosition(
wxCoord vTextY = 0;
wxCoord vTBarHeight = 0;
GetSize( NULL
,&vTBarHeight
);
vY = vTBarHeight - vY;
wxToolBarToolsList::Node* pNode = m_tools.GetFirst();
while (pNode)
{
@@ -1132,15 +1269,23 @@ void wxToolBar::LowerTool (
return;
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
{
if (pTool->GetWidth() > m_vTextX)
{
vX = pTool->m_vX - 2;
vWidth = pTool->GetWidth() + 4;
}
else
{
vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
vY = pTool->m_vY - 2;
vWidth = m_vTextX + 4;
}
vY = pTool->m_vY - 2;
vHeight = pTool->GetHeight() + m_vTextY + 2;
}
else
{
vX = pTool->m_vX;
vX = pTool->m_vX - 2;
vY = pTool->m_vY - 2;
vWidth = pTool->GetWidth() + 4;
vHeight = pTool->GetHeight() + 4;
@@ -1204,15 +1349,23 @@ void wxToolBar::RaiseTool (
return;
if (HasFlag(wxTB_TEXT) && !pTool->GetLabel().IsEmpty())
{
if (pTool->GetWidth() > m_vTextX)
{
vX = pTool->m_vX - 2;
vWidth = pTool->GetWidth() + 4;
}
else
{
vX = pTool->m_vX - (wxCoord)(pTool->GetWidth()/2);
vY = pTool->m_vY - 2;
vWidth = m_vTextX + 4;
}
vY = pTool->m_vY - 2;
vHeight = pTool->GetHeight() + m_vTextY + 2;
}
else
{
vX = pTool->m_vX;
vX = pTool->m_vX - 2;
vY = pTool->m_vY - 2;
vWidth = pTool->GetWidth() + 4;
vHeight = pTool->GetHeight() + 4;

96
src/os2/wx23.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL
EXPORTS
;From library: H:\Dev\Wx2\WxWindows\lib\wx.lib
;From library: F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file):
wxDummyChar
@@ -1946,7 +1946,7 @@ EXPORTS
wxEVT_NC_LEFT_DCLICK
wxEVT_INIT_DIALOG
wxEVT_COMMAND_SET_FOCUS
;From object file: H:\DEV\WX2\WXWINDOWS\src\common\extended.c
;From object file: F:\DEV\WX2\WXWINDOWS\src\common\extended.c
;PUBDEFs (Symbols available from object file):
ConvertToIeeeExtended
ConvertFromIeeeExtended
@@ -6150,7 +6150,7 @@ EXPORTS
Read32__17wxTextInputStreamFv
;wxTextInputStream::SkipIfEndOfLine(char)
SkipIfEndOfLine__17wxTextInputStreamFc
;From object file: H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
;From object file: F:\DEV\WX2\WXWINDOWS\src\common\unzip.c
;PUBDEFs (Symbols available from object file):
unzReadCurrentFile
unzGetCurrentFileInfo
@@ -11623,12 +11623,10 @@ EXPORTS
Create__8wxBitmapFPvliN23
;wxBitmap::GetBitmapForDC(wxDC&) const
GetBitmapForDC__8wxBitmapCFR4wxDC
;wxBitmap::wxBitmap(const wxString&,long)
__ct__8wxBitmapFRC8wxStringl
;wxMask::wxMask(const wxBitmap&)
__ct__6wxMaskFRC8wxBitmap
;wxBitmap::GetSubBitmap(const wxRect&) const
GetSubBitmap__8wxBitmapCFRC6wxRect
;wxMask::wxMask(const wxBitmap&)
__ct__6wxMaskFRC8wxBitmap
;wxMask::Create(const wxBitmap&)
Create__6wxMaskFRC8wxBitmap
;wxBitmapHandler::Create(wxBitmap*,void*,long,int,int,int)
@@ -11660,30 +11658,32 @@ EXPORTS
__ct__8wxBitmapFPCciN22
;wxBitmapRefData::wxBitmapRefData()
__ct__15wxBitmapRefDataFv
;wxBitmapHandler::Load(wxGDIImage*,int,long,int,int)
Load__15wxBitmapHandlerFP10wxGDIImageilN22
;wxMask::Create(const wxBitmap&,const wxColour&)
Create__6wxMaskFRC8wxBitmapRC8wxColour
;wxBitmap::ConvertToImage() const
ConvertToImage__8wxBitmapCFv
;wxBitmap::wxBitmap(void*,long,int,int,int)
__ct__8wxBitmapFPvliN23
;wxBitmap::LoadFile(const wxString&,long)
LoadFile__8wxBitmapFRC8wxStringl
;wxBitmap::LoadFile(int,long)
LoadFile__8wxBitmapFil
;wxBitmap::CreateFromImage(const wxImage&,int)
CreateFromImage__8wxBitmapFRC7wxImagei
;wxBitmap::SetPalette(const wxPalette&)
SetPalette__8wxBitmapFRC9wxPalette
;wxBitmapHandler::Save(wxGDIImage*,const wxString&,int)
Save__15wxBitmapHandlerFP10wxGDIImageRC8wxStringi
;wxBitmapHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
LoadFile__15wxBitmapHandlerFP8wxBitmapRC8wxStringUlliT5
;wxConstructorForwxBitmapHandler()
wxConstructorForwxBitmapHandler__Fv
;wxBitmapHandler::LoadFile(wxBitmap*,int,long,int,int)
LoadFile__15wxBitmapHandlerFP8wxBitmapilN22
;wxBitmapRefData::Free()
Free__15wxBitmapRefDataFv
;wxBitmap::wxBitmap(int,long)
__ct__8wxBitmapFil
;wxBitmap::sm_classwxBitmap
sm_classwxBitmap__8wxBitmap
;wxBitmapHandler::Load(wxGDIImage*,const wxString&,unsigned long,long,int,int)
Load__15wxBitmapHandlerFP10wxGDIImageRC8wxStringUlliT5
;wxConstructorForwxBitmap()
wxConstructorForwxBitmap__Fv
;wxConstructorForwxMask()
@@ -12915,6 +12915,8 @@ EXPORTS
wxConstructorForwxICOResourceHandler__Fv
;wxBMPFileHandler::sm_classwxBMPFileHandler
sm_classwxBMPFileHandler__16wxBMPFileHandler
;wxBMPResourceHandler::LoadFile(wxBitmap*,int,long,int,int)
LoadFile__20wxBMPResourceHandlerFP8wxBitmapilN22
;wxGDIImage::CleanUpHandlers()
CleanUpHandlers__10wxGDIImageFv
;wxGDIImage::AddHandler(wxGDIImageHandler*)
@@ -12922,8 +12924,6 @@ EXPORTS
;wxGDIImage::FindHandler(long)
FindHandler__10wxGDIImageFl
__vft20wxBMPResourceHandler8wxObject
;wxBMPResourceHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
LoadFile__20wxBMPResourceHandlerFP8wxBitmapRC8wxStringUlliT5
;wxICOResourceHandler::LoadIcon(wxIcon*,const wxString&,unsigned long,long,int,int)
LoadIcon__20wxICOResourceHandlerFP6wxIconRC8wxStringUlliT5
;wxConstructorForwxBMPResourceHandler()
@@ -13776,58 +13776,6 @@ EXPORTS
__dt__12wxPenRefDataFv
;wxPen::SetColour(const wxColour&)
SetColour__5wxPenFRC8wxColour
;From object file: ..\os2\pnghand.cpp
;PUBDEFs (Symbols available from object file):
;wxPNGReader::Create(int,int,int,int)
Create__11wxPNGReaderFiN31
;wxCopyPalette(const wxPalette*)
wxCopyPalette__FPC9wxPalette
;wxPNGFileHandler::SaveFile(wxBitmap*,const wxString&,int,const wxPalette*)
SaveFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringiPC9wxPalette
;wxPNGReader::GetIndex(int,int)
GetIndex__11wxPNGReaderFiT1
;wxPNGReader::~wxPNGReader()
__dt__11wxPNGReaderFv
;wxPNGReader::ReadFile(char*)
ReadFile__11wxPNGReaderFPc
;wxPNGReader::SetRGB(int,int,unsigned char,unsigned char,unsigned char)
SetRGB__11wxPNGReaderFiT1UcN23
;wxPNGReader::SetPalette(int,rgb_color_struct*)
SetPalette__11wxPNGReaderFiP16rgb_color_struct
;wxPNGReader::InstantiateBitmap(wxBitmap*)
InstantiateBitmap__11wxPNGReaderFP8wxBitmap
;wxPNGReader::SetPalette(int,unsigned char*,unsigned char*,unsigned char*)
SetPalette__11wxPNGReaderFiPUcN22
;wxConstructorForwxPNGFileHandler()
wxConstructorForwxPNGFileHandler__Fv
;wxPNGReader::NullData()
NullData__11wxPNGReaderFv
;wxPNGReader::SaveFile(char*)
SaveFile__11wxPNGReaderFPc
;wxPNGReader::SetIndex(int,int,int)
SetIndex__11wxPNGReaderFiN21
;wxPNGReader::SaveXPM(char*,char*)
SaveXPM__11wxPNGReaderFPcT1
;wxPNGFileHandler::LoadFile(wxBitmap*,const wxString&,unsigned long,long,int,int)
LoadFile__16wxPNGFileHandlerFP8wxBitmapRC8wxStringUlliT5
__vft11wxPNGReader
;ima_png_error(png_struct_def*,char*)
ima_png_error__FP14png_struct_defPc
;wxPNGReader::wxPNGReader(char*)
__ct__11wxPNGReaderFPc
;wxPNGReader::GetRGB(int,int,unsigned char*,unsigned char*,unsigned char*)
GetRGB__11wxPNGReaderFiT1PUcN23
__vft16wxPNGFileHandler8wxObject
;wxPNGReader::SetPalette(wxPalette*)
SetPalette__11wxPNGReaderFP9wxPalette
;wxPNGReader::wxPNGReader()
__ct__11wxPNGReaderFv
;wxPNGFileHandler::sm_classwxPNGFileHandler
sm_classwxPNGFileHandler__16wxPNGFileHandler
;wxPNGReader::GetBitmap()
GetBitmap__11wxPNGReaderFv
;wxPNGReader::CreateMask()
CreateMask__11wxPNGReaderFv
;From object file: ..\os2\popupwin.cpp
;PUBDEFs (Symbols available from object file):
__vft13wxPopupWindow8wxObject
@@ -14717,6 +14665,8 @@ EXPORTS
CreateTool__9wxToolBarFP9wxControl
;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long)
DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::DeleteToolByPos(unsigned int)
DeleteToolByPos__9wxToolBarFUi
;wxToolBar::SpringUpButton(int)
SpringUpButton__9wxToolBarFi
;wxToolBar::Init()
@@ -14725,10 +14675,14 @@ EXPORTS
sm_eventTable__9wxToolBar
;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
;wxToolBar::InsertControl(unsigned int,wxControl*)
InsertControl__9wxToolBarFUiP9wxControl
;wxToolBar::OnKillFocus(wxFocusEvent&)
OnKillFocus__9wxToolBarFR12wxFocusEvent
;wxToolBar::LowerTool(wxToolBarToolBase*,unsigned long)
LowerTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::InsertSeparator(unsigned int)
InsertSeparator__9wxToolBarFUi
;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*)
DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase
;wxToolBar::Realize()
@@ -14737,11 +14691,15 @@ EXPORTS
sm_eventTableEntries__9wxToolBar
;wxToolBar::sm_classwxToolBar
sm_classwxToolBar__9wxToolBar
;wxToolBar::OnPaint(wxPaintEvent&)
OnPaint__9wxToolBarFR12wxPaintEvent
;wxToolBar::InsertTool(unsigned int,int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*)
InsertTool__9wxToolBarFUiiRC8wxStringRC8wxBitmapT410wxItemKindN23P8wxObject
__vft9wxToolBar8wxObject
;wxToolBar::RaiseTool(wxToolBarToolBase*,unsigned long)
RaiseTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::OnPaint(wxPaintEvent&)
OnPaint__9wxToolBarFR12wxPaintEvent
;wxToolBar::DeleteTool(int)
DeleteTool__9wxToolBarFi
;wxToolBar::DrawTool(wxDC&,wxToolBarToolBase*)
DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
;wxToolBar::OnSize(wxSizeEvent&)