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

OS/2 updates and initial toolbar implementation

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-07-01 22:22:13 +00:00
parent 4daa4d665a
commit d697657f1e
14 changed files with 1345 additions and 1122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/os2/frame.h
View File

@@ -71,6 +71,10 @@ public:
,const wxString& rsName = wxToolBarNameStr ,const wxString& rsName = wxToolBarNameStr
); );
virtual wxToolBar* OnCreateToolBar( long lStyle
,wxWindowID vId
,const wxString& rsName
);
virtual void PositionToolBar(void); virtual void PositionToolBar(void);
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR

8
include/wx/os2/slider.h
View File

@@ -66,16 +66,13 @@ public:
virtual int GetValue(void) const ; virtual int GetValue(void) const ;
virtual void SetValue(int); virtual void SetValue(int);
virtual void DoGetSize( int* pnWidth
,int* pnHeight
) const;
void GetSize( int* pnX void GetSize( int* pnX
,int* pnY ,int* pnY
) const; ) const;
void GetPosition( int* pnX void GetPosition( int* pnX
,int* pnY ,int* pnY
) const ; ) const ;
bool Show(bool bShow); bool Show(bool bShow = TRUE);
void SetRange( int nMinValue void SetRange( int nMinValue
,int nMaxValue ,int nMaxValue
); );
@@ -148,6 +145,9 @@ protected:
int m_nThumbLength; int m_nThumbLength;
int m_nSizeFlags; int m_nSizeFlags;
virtual void DoGetSize( int* pnWidth
,int* pnHeight
) const;
virtual void DoSetSize( int nX virtual void DoSetSize( int nX
,int nY ,int nY
,int nWidth ,int nWidth

126
include/wx/os2/toolbar.h
View File

@@ -32,6 +32,7 @@ public:
,const wxString& rName = wxToolBarNameStr ,const wxString& rName = wxToolBarNameStr
) )
{ {
Init();
Create( pParent Create( pParent
,vId ,vId
,rPos ,rPos
@@ -40,6 +41,8 @@ public:
,rName ,rName
); );
} }
virtual ~wxToolBar();
bool Create( wxWindow* pParent bool Create( wxWindow* pParent
,wxWindowID vId ,wxWindowID vId
,const wxPoint& rPos = wxDefaultPosition ,const wxPoint& rPos = wxDefaultPosition
@@ -48,69 +51,104 @@ public:
,const wxString& rName = wxToolBarNameStr ,const wxString& rName = wxToolBarNameStr
); );
virtual ~wxToolBar();
// override/implement base class virtuals //
virtual wxToolBarToolBase* FindToolForPosition( wxCoord x // Override/implement base class virtuals
,wxCoord y //
virtual wxToolBarToolBase* FindToolForPosition( wxCoord vX
,wxCoord vY
) const; ) const;
// The post-tool-addition call
virtual bool Realize(void); virtual bool Realize(void);
virtual void SetToolBitmapSize(const wxSize& rSize);
virtual wxSize GetToolSize(void) const;
virtual void SetRows(int nRows); virtual void SetRows(int nRows);
// IMPLEMENTATION //
virtual bool OS2Command( WXUINT uParam // Event handlers
,WXWORD wId //
); void OnPaint(wxPaintEvent& event);
virtual bool OS2OnNotify( int nCtrl void OnSize(wxSizeEvent& event);
,WXLPARAM lParam void OnMouseEvent(wxMouseEvent& event);
,WXLPARAM* pResult void OnKillFocus(wxFocusEvent& event);
);
void OnMouseEvent(wxMouseEvent& rEvent);
void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
protected: protected:
void Init(void); //
// implement base class pure virtuals // Common part of all ctors
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); //
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); void Init();
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); //
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); // Implement base class pure virtuals
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); //
virtual wxToolBarToolBase* DoAddTool( int id
,const wxString& label
,const wxBitmap& bitmap
,const wxBitmap& bmpDisabled
,wxItemKind kind
,const wxString& shortHelp = wxEmptyString
,const wxString& longHelp = wxEmptyString
,wxObject *clientData = NULL
,wxCoord xPos = -1
,wxCoord yPos = -1
);
virtual bool DoInsertTool( size_t nPos
,wxToolBarToolBase* pTool
);
virtual bool DoDeleteTool( size_t nPos
, wxToolBarToolBase* pTool
);
virtual void DoEnableTool( wxToolBarToolBase* pTool
,bool bEnable
);
virtual void DoToggleTool( wxToolBarToolBase* pTool
,bool bToggle
);
virtual void DoSetToggle( wxToolBarToolBase* pTool
,bool bToggle
);
virtual wxToolBarToolBase* CreateTool( int vId virtual wxToolBarToolBase* CreateTool( int vId
,const wxString& rsLabel ,const wxString& rsLabel
,const wxBitmap& rBitmapNormal ,const wxBitmap& rBmpNormal
,const wxBitmap& rBitmapDisabled ,const wxBitmap& rBmpDisabled
,wxItemKind vKind ,wxItemKind eKind
,wxObject* pClientData ,wxObject* pClientData
,const wxString& rShortHelpString ,const wxString& rsShortHelp
,const wxString& rLongHelpString ,const wxString& rsLongHelp
); );
virtual wxToolBarToolBase* CreateTool(wxControl* pControl); virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
// should be called whenever the toolbar size changes //
void UpdateSize(void); // Helpers
//
// override WndProc to process WM_SIZE void DrawTool(wxToolBarToolBase *tool);
virtual MRESULT OS2WindowProc( WXUINT ulMsg virtual void DrawTool( wxDC& rDC
,WXWPARAM wParam ,wxToolBarToolBase* pTool
,WXLPARAM lParam
); );
virtual void SpringUpButton(int nIndex);
// the big bitmap containing all bitmaps of the toolbar buttons int m_nCurrentRowsOrColumns;
WXHBITMAP m_hBitmap; int m_nPressedTool;
int m_nCurrentTool;
// the total number of toolbar elements wxCoord m_vLastX;
size_t m_nButtons; wxCoord m_vLastY;
wxCoord m_vMaxWidth;
wxCoord m_vMaxHeight;
wxCoord m_vXPos;
wxCoord m_vYPos;
wxCoord m_vTextX;
wxCoord m_vTextY;
private: private:
void LowerTool( wxToolBarToolBase* pTool
,bool bLower = TRUE
);
void RaiseTool( wxToolBarToolBase* pTool
,bool bRaise = TRUE
);
static bool m_bInitialized;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxToolBar) DECLARE_DYNAMIC_CLASS(wxToolBar)
}; };

4
src/os2/dc.cpp
View File

@@ -1392,9 +1392,9 @@ void wxDC::DoDrawBitmap(
// //
if (IsKindOf(CLASSINFO(wxPaintDC))) if (IsKindOf(CLASSINFO(wxPaintDC)))
{ {
wxPaintDC* pPaintDC = wxDynamicCast(this, wxPaintDC); wxWindowDC* pWindowDC = wxDynamicCast(this, wxWindowDC);
lColor = pPaintDC->m_pCanvas->GetBackgroundColour().GetPixel(); lColor = pWindowDC->m_pCanvas->GetBackgroundColour().GetPixel();
} }
else if (GetBrush() != wxNullBrush) else if (GetBrush() != wxNullBrush)
lColor = GetBrush().GetColour().GetPixel(); lColor = GetBrush().GetColour().GetPixel();

8
src/os2/font.cpp
View File

@@ -371,6 +371,8 @@ bool wxFontRefData::Alloc(
long lRc; long lRc;
short nIndex = 0; short nIndex = 0;
PFONTMETRICS pFM = NULL; PFONTMETRICS pFM = NULL;
ERRORID vError;
wxString sError;
if (!m_bNativeFontInfoOk) if (!m_bNativeFontInfoOk)
{ {
@@ -396,6 +398,8 @@ bool wxFontRefData::Alloc(
} }
if (!m_hFont) if (!m_hFont)
{ {
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
wxLogLastError("CreateFont"); wxLogLastError("CreateFont");
} }
@@ -496,10 +500,6 @@ void wxFontRefData::Free()
if ( m_hFont ) if ( m_hFont )
{ {
if (!::GpiSetCharSet(m_hPS, LCID_DEFAULT))
{
wxLogLastError(wxT("DeleteObject(font)"));
}
::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font */ ::GpiDeleteSetId(m_hPS, 1L); /* delete the logical font */
m_nFontId = 0; m_nFontId = 0;
m_hFont = 0; m_hFont = 0;

4
src/os2/fontutil.cpp
View File

@@ -361,6 +361,7 @@ void wxFillLogFont(
STR8 azNames[255]; STR8 azNames[255];
long alIds[255]; long alIds[255];
memset(alIds, 0, sizeof(long) * 255);
if(!::GpiQuerySetIds( *phPS if(!::GpiQuerySetIds( *phPS
,lNumLids ,lNumLids
,alTypes ,alTypes
@@ -372,7 +373,8 @@ void wxFillLogFont(
::WinReleasePS(*phPS); ::WinReleasePS(*phPS);
return; return;
} }
if (*pflId == 0L)
*pflId = 1L;
for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++) for(unsigned long LCNum = 0; LCNum < lNumLids; LCNum++)
if(alIds[LCNum] == *pflId) if(alIds[LCNum] == *pflId)
++*pflId; ++*pflId;

128
src/os2/frame.cpp
View File

@@ -318,6 +318,29 @@ void wxFrame::PositionStatusBar()
} // end of wxFrame::PositionStatusBar } // end of wxFrame::PositionStatusBar
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
wxToolBar* wxFrame::OnCreateToolBar(
long lStyle
, wxWindowID vId
, const wxString& rsName
)
{
wxToolBar* pToolBar = wxFrameBase::OnCreateToolBar( lStyle
,vId
,rsName
);
::WinSetParent( pToolBar->GetHWND()
,m_hFrame
,FALSE
);
::WinSetOwner( pToolBar->GetHWND()
,m_hFrame
);
return pToolBar;
} // end of WinGuiBase_CFrame::OnCreateToolBar
#endif
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
void wxFrame::DetachMenuBar() void wxFrame::DetachMenuBar()
{ {
@@ -722,53 +745,59 @@ wxToolBar* wxFrame::CreateToolBar(
void wxFrame::PositionToolBar() void wxFrame::PositionToolBar()
{ {
wxToolBar* pToolBar = GetToolBar();
wxCoord vWidth;
wxCoord vHeight;
wxCoord vTWidth;
wxCoord vTHeight;
if (!pToolBar)
return;
HWND hWndClient; HWND hWndClient;
RECTL vRect; RECTL vRect;
RECTL vFRect;
SWP vSwp;
wxPoint vPos;
::WinQueryWindowRect(GetHwnd(), &vRect); ::WinQueryWindowRect(m_hFrame, &vRect);
vPos.y = (wxCoord)vRect.yTop;
::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
vFRect = vRect;
::WinCalcFrameRect(m_hFrame, &vRect, TRUE);
#if wxUSE_STATUSBAR vPos.y = (wxCoord)(vFRect.yTop - vRect.yTop);
if (GetStatusBar()) pToolBar->GetSize( &vTWidth
{ ,&vTHeight
int nStatusX;
int nStatusY;
GetStatusBar()->GetClientSize( &nStatusX
,&nStatusY
);
// PM is backwards from windows
vRect.yBottom += nStatusY;
}
#endif // wxUSE_STATUSBAR
if ( m_frameToolBar )
{
int nToolbarWidth;
int nToolbarHeight;
m_frameToolBar->GetSize( &nToolbarWidth
,&nToolbarHeight
); );
if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) if (pToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL)
{ {
nToolbarHeight = vRect.yBottom; vWidth = (wxCoord)(vRect.xRight - vRect.xLeft);
pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
,vPos.y
,vWidth
,vTHeight
);
} }
else else
{ {
nToolbarWidth = vRect.xRight; wxCoord vSwidth = 0;
} wxCoord vSheight = 0;
// if (m_frameStatusBar)
// Use the 'real' PM position here m_frameStatusBar->GetSize( &vSwidth
// ,&vSheight
GetToolBar()->SetSize( 0 );
,0 vHeight = (wxCoord)(vRect.yTop - vRect.yBottom);
,nToolbarWidth pToolBar->SetSize( vRect.xLeft - vFRect.xLeft
,nToolbarHeight ,vPos.y
,wxSIZE_NO_ADJUSTMENTS ,vTWidth
,vHeight - vSheight
); );
} }
if( ::WinIsWindowShowing(m_hFrame) )
::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
} // end of wxFrame::PositionToolBar } // end of wxFrame::PositionToolBar
#endif // wxUSE_TOOLBAR #endif // wxUSE_TOOLBAR
@@ -1133,10 +1162,12 @@ MRESULT EXPENTRY wxFrameMainWndProc(
int nItemCount; int nItemCount;
int i; int i;
PSWP pSWP = NULL; PSWP pSWP = NULL;
SWP vSwpStb;
RECTL vRectl; RECTL vRectl;
RECTL vRstb; RECTL vRstb;
RECTL vRtlb;
int nHeight = 0; int nHeight = 0;
int nHeight2 = 0;
int nWidth = 0;
pSWP = (PSWP)PVOIDFROMMP(wParam); pSWP = (PSWP)PVOIDFROMMP(wParam);
nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
@@ -1144,18 +1175,11 @@ MRESULT EXPENTRY wxFrameMainWndProc(
{ {
::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb); ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb);
pWnd->m_frameStatusBar->GetSize(NULL, &nHeight); pWnd->m_frameStatusBar->GetSize(NULL, &nHeight);
::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); }
::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); if(pWnd->m_frameToolBar)
vRstb = vRectl; {
::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); ::WinQueryWindowRect(pWnd->m_frameToolBar->GetHWND(), &vRtlb);
pWnd->m_frameToolBar->GetSize(&nWidth, &nHeight2);
vSwpStb.x = vRectl.xLeft - vRstb.xLeft;
vSwpStb.y = vRectl.yBottom - vRstb.yBottom;
vSwpStb.cx = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ??
vSwpStb.cy = nHeight;
vSwpStb.fl = SWP_SIZE |SWP_MOVE | SWP_SHOW;
vSwpStb.hwnd = pWnd->m_frameStatusBar->GetHWND();
vSwpStb.hwndInsertBehind = HWND_TOP;
} }
::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
@@ -1164,11 +1188,21 @@ MRESULT EXPENTRY wxFrameMainWndProc(
for(i = 0; i < nItemCount; i++) for(i = 0; i < nItemCount; i++)
{ {
if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd) if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
{
if (pWnd->m_frameToolBar && pWnd->m_frameToolBar->GetWindowStyleFlag() & wxTB_HORIZONTAL)
{ {
pSWP[i].x = vRectl.xLeft; pSWP[i].x = vRectl.xLeft;
pSWP[i].y = vRectl.yBottom + nHeight; pSWP[i].y = vRectl.yBottom + nHeight;
pSWP[i].cx = vRectl.xRight - vRectl.xLeft; pSWP[i].cx = vRectl.xRight - vRectl.xLeft;
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - (nHeight + nHeight2);
}
else
{
pSWP[i].x = vRectl.xLeft;
pSWP[i].y = vRectl.yBottom + nHeight;
pSWP[i].cx = vRectl.xRight - (vRectl.xLeft + nWidth);
pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight;
}
pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW; pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW;
pSWP[i].hwndInsertBehind = HWND_TOP; pSWP[i].hwndInsertBehind = HWND_TOP;
} }

3
src/os2/makefile.va
View File

@@ -106,7 +106,6 @@ GENERICOBJS= \
..\generic\$D\dirdlgg.obj \ ..\generic\$D\dirdlgg.obj \
..\generic\$D\dirctrlg.obj \ ..\generic\$D\dirctrlg.obj \
..\generic\$D\dragimgg.obj \ ..\generic\$D\dragimgg.obj \
..\generic\$D\fontdlgg.obj \
..\generic\$D\fdrepdlg.obj \ ..\generic\$D\fdrepdlg.obj \
..\generic\$D\grid.obj \ ..\generic\$D\grid.obj \
..\generic\$D\gridctrl.obj \ ..\generic\$D\gridctrl.obj \
@@ -153,7 +152,6 @@ GENLIBOBJS= \
dirdlgg.obj \ dirdlgg.obj \
dirctrlg.obj \ dirctrlg.obj \
dragimgg.obj \ dragimgg.obj \
fontdlgg.obj \
fdrepdlg.obj \ fdrepdlg.obj \
grid.obj \ grid.obj \
gridctrl.obj \ gridctrl.obj \
@@ -853,7 +851,6 @@ $(GENLIBOBJS):
copy ..\generic\$D\dcpsg.obj copy ..\generic\$D\dcpsg.obj
copy ..\generic\$D\dirdlgg.obj copy ..\generic\$D\dirdlgg.obj
copy ..\generic\$D\dirctrlg.obj copy ..\generic\$D\dirctrlg.obj
copy ..\generic\$D\fontdlgg.obj
copy ..\generic\$D\fdrepdlg.obj copy ..\generic\$D\fdrepdlg.obj
copy ..\generic\$D\grid.obj copy ..\generic\$D\grid.obj
copy ..\generic\$D\gridctrl.obj copy ..\generic\$D\gridctrl.obj

23
src/os2/pen.cpp
View File

@@ -214,6 +214,8 @@ bool wxPen::RealizeResource()
return FALSE; return FALSE;
} }
ULONG flAttrMask = 0L;
ULONG flDefMask = 0L;
switch(M_PENDATA->m_nStyle) switch(M_PENDATA->m_nStyle)
{ {
case wxSTIPPLE: case wxSTIPPLE:
@@ -224,41 +226,57 @@ bool wxPen::RealizeResource()
::GpiSetPatternSet( M_PENDATA->m_hPen ::GpiSetPatternSet( M_PENDATA->m_hPen
,(USHORT)M_PENDATA->m_vStipple.GetId() ,(USHORT)M_PENDATA->m_vStipple.GetId()
); );
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SET | ABB_SYMBOL;
flDefMask = ABB_REF_POINT;
break; break;
case wxBDIAGONAL_HATCH: case wxBDIAGONAL_HATCH:
m_vAreaBundle.usSymbol = PATSYM_DIAG3; m_vAreaBundle.usSymbol = PATSYM_DIAG3;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
case wxCROSSDIAG_HATCH: case wxCROSSDIAG_HATCH:
m_vAreaBundle.usSymbol = PATSYM_DIAGHATCH; m_vAreaBundle.usSymbol = PATSYM_DIAGHATCH;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
case wxFDIAGONAL_HATCH: case wxFDIAGONAL_HATCH:
m_vAreaBundle.usSymbol = PATSYM_DIAG1; m_vAreaBundle.usSymbol = PATSYM_DIAG1;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
case wxCROSS_HATCH: case wxCROSS_HATCH:
m_vAreaBundle.usSymbol = PATSYM_HATCH; m_vAreaBundle.usSymbol = PATSYM_HATCH;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
case wxHORIZONTAL_HATCH: case wxHORIZONTAL_HATCH:
m_vAreaBundle.usSymbol = PATSYM_HORIZ; m_vAreaBundle.usSymbol = PATSYM_HORIZ;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
case wxVERTICAL_HATCH: case wxVERTICAL_HATCH:
m_vAreaBundle.usSymbol = PATSYM_VERT; m_vAreaBundle.usSymbol = PATSYM_VERT;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
default: default:
m_vAreaBundle.usSymbol = PATSYM_SOLID; m_vAreaBundle.usSymbol = PATSYM_SOLID;
m_vAreaBundle.usSet = LCID_DEFAULT; m_vAreaBundle.usSet = LCID_DEFAULT;
flAttrMask = ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ABB_SYMBOL;
flDefMask = ABB_SET | ABB_REF_POINT;
break; break;
} }
@@ -269,9 +287,8 @@ bool wxPen::RealizeResource()
bOk = ::GpiSetAttrs( M_PENDATA->m_hPen bOk = ::GpiSetAttrs( M_PENDATA->m_hPen
,PRIM_AREA ,PRIM_AREA
,ABB_COLOR | ABB_BACK_COLOR | ABB_MIX_MODE | ABB_BACK_MIX_MODE | ,flAttrMask
ABB_SET | ABB_SYMBOL ,flDefMask
,ABB_REF_POINT
,&m_vAreaBundle ,&m_vAreaBundle
); );
if (!bOk) if (!bOk)

11
src/os2/settings.cpp
View File

@@ -149,6 +149,17 @@ wxColour wxSystemSettingsNative::GetColour(
); );
break; break;
case wxSYS_COLOUR_MENUBAR:
vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP
,SYSCLR_MENU
,0L
);
vCol.Set( GetRValue(vRef)
,GetGValue(vRef)
,GetBValue(vRef)
);
break;
// //
// We'll have to just give values to these // We'll have to just give values to these
// //

6
src/os2/statbmp.cpp
View File

@@ -71,13 +71,11 @@ bool wxStaticBitmap::Create(
m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon)); m_bIsIcon = rBitmap.IsKindOf(CLASSINFO(wxIcon));
// TODO: create static bitmap control
const wxChar* zClassname = wxT("WX_STATIC");
int nWinstyle = m_bIsIcon ? SS_ICON : SS_BITMAP; int nWinstyle = m_bIsIcon ? SS_ICON : SS_BITMAP;
m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND() m_hWnd = (WXHWND)::WinCreateWindow( pParent->GetHWND()
,zClassname ,WC_STATIC
,wxT("") ,rName.c_str()
,nWinstyle | WS_VISIBLE ,nWinstyle | WS_VISIBLE
,0,0,0,0 ,0,0,0,0
,pParent->GetHWND() ,pParent->GetHWND()

1834
src/os2/toolbar.cpp
View File

File diff suppressed because it is too large Load Diff

12
src/os2/window.cpp
View File

@@ -3069,31 +3069,27 @@ bool wxWindowOS2::OS2GetCreateWindowCoords(
) const ) const
{ {
bool bNonDefault = FALSE; bool bNonDefault = FALSE;
static const int DEFAULT_Y = 200;
static const int DEFAULT_H = 250;
if (rPos.x == -1) if (rPos.x == -1)
{ {
//
// If set x to CW_USEDEFAULT, y parameter is ignored anyhow so we can
// just as well set it to CW_USEDEFAULT as well
rnX = rnY = CW_USEDEFAULT; rnX = rnY = CW_USEDEFAULT;
} }
else else
{ {
rnX = rPos.x; rnX = rPos.x;
rnY = rPos.y == -1 ? CW_USEDEFAULT : rPos.y; rnY = rPos.y == -1 ? DEFAULT_Y : rPos.y;
bNonDefault = TRUE; bNonDefault = TRUE;
} }
if (rSize.x == -1) if (rSize.x == -1)
{ {
//
// As abobe, h is not used at all in this case anyhow
//
rnWidth = rnHeight = CW_USEDEFAULT; rnWidth = rnHeight = CW_USEDEFAULT;
} }
else else
{ {
rnWidth = rSize.x; rnWidth = rSize.x;
rnHeight = rSize.y == -1 ? CW_USEDEFAULT : rSize.y; rnHeight = rSize.y == -1 ? DEFAULT_H : rSize.y;
bNonDefault = TRUE; bNonDefault = TRUE;
} }
return bNonDefault; return bNonDefault;

144
src/os2/wx23.def
View File

@@ -7388,8 +7388,8 @@ EXPORTS
GetEventTable__14wxYearSpinCtrlCFv GetEventTable__14wxYearSpinCtrlCFv
;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const ;wxCalendarCtrl::GetDateCoord(const wxDateTime&,int*,int*) const
GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2 GetDateCoord__14wxCalendarCtrlCFRC10wxDateTimePiT2
;wxCalendarCtrl::OnYearChange(wxSpinEvent&) ;wxCalendarCtrl::OnPaint(wxPaintEvent&)
OnYearChange__14wxCalendarCtrlFR11wxSpinEvent OnPaint__14wxCalendarCtrlFR12wxPaintEvent
wxEVT_CALENDAR_DAY_CHANGED wxEVT_CALENDAR_DAY_CHANGED
;wxYearSpinCtrl::sm_eventTable ;wxYearSpinCtrl::sm_eventTable
sm_eventTable__14wxYearSpinCtrl sm_eventTable__14wxYearSpinCtrl
@@ -7402,8 +7402,6 @@ EXPORTS
;wxCalendarCtrl::sm_classwxCalendarCtrl ;wxCalendarCtrl::sm_classwxCalendarCtrl
sm_classwxCalendarCtrl__14wxCalendarCtrl sm_classwxCalendarCtrl__14wxCalendarCtrl
__vft14wxCalendarCtrl8wxObject __vft14wxCalendarCtrl8wxObject
;wxCalendarCtrl::OnPaint(wxPaintEvent&)
OnPaint__14wxCalendarCtrlFR12wxPaintEvent
;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const ;wxCalendarCtrl::IsDateInRange(const wxDateTime&) const
IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime IsDateInRange__14wxCalendarCtrlCFRC10wxDateTime
;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*) ;wxCalendarCtrl::HitTest(const wxPoint&,wxDateTime*,wxDateTime::WeekDay*)
@@ -7432,10 +7430,12 @@ EXPORTS
__vft15wxMonthComboBox15wxItemContainer __vft15wxMonthComboBox15wxItemContainer
;wxCalendarCtrl::GetStartDate() const ;wxCalendarCtrl::GetStartDate() const
GetStartDate__14wxCalendarCtrlCFv GetStartDate__14wxCalendarCtrlCFv
;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*) ;wxCalendarCtrl::OnYearChange(wxCommandEvent&)
__ct__15wxMonthComboBoxFP14wxCalendarCtrl OnYearChange__14wxCalendarCtrlFR14wxCommandEvent
;wxMonthComboBox::sm_eventTable ;wxMonthComboBox::sm_eventTable
sm_eventTable__15wxMonthComboBox sm_eventTable__15wxMonthComboBox
;wxMonthComboBox::wxMonthComboBox(wxCalendarCtrl*)
__ct__15wxMonthComboBoxFP14wxCalendarCtrl
;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*) ;wxYearSpinCtrl::wxYearSpinCtrl(wxCalendarCtrl*)
__ct__14wxYearSpinCtrlFP14wxCalendarCtrl __ct__14wxYearSpinCtrlFP14wxCalendarCtrl
;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*) ;wxCalendarCtrl::HighlightRange(wxPaintDC*,const wxDateTime&,const wxDateTime&,wxPen*,wxBrush*)
@@ -7918,58 +7918,6 @@ EXPORTS
;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&) ;wxGenericDirCtrl::ExtractWildcard(const wxString&,int,wxString&,wxString&)
ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3 ExtractWildcard__16wxGenericDirCtrlFRC8wxStringiR8wxStringT3
;From object file: ..\generic\dragimgg.cpp ;From object file: ..\generic\dragimgg.cpp
;From object file: ..\generic\fontdlgg.cpp
;PUBDEFs (Symbols available from object file):
;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,const wxFontData&)
__ct__19wxGenericFontDialogFP8wxWindowRC10wxFontData
;wxFontStyleIntToString(int)
wxFontStyleIntToString__Fi
;wxGenericFontDialog::GetEventTable() const
GetEventTable__19wxGenericFontDialogCFv
;wxFontPreviewer::sm_eventTable
sm_eventTable__15wxFontPreviewer
;wxGenericFontDialog::~wxGenericFontDialog()
__dt__19wxGenericFontDialogFv
;wxFontWeightStringToInt(char*)
wxFontWeightStringToInt__FPc
__vft15wxFontPreviewer8wxObject
__vft19wxGenericFontDialog8wxObject
;wxFontFamilyIntToString(int)
wxFontFamilyIntToString__Fi
;wxFontPreviewer::OnPaint(wxPaintEvent&)
OnPaint__15wxFontPreviewerFR12wxPaintEvent
;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
;wxGenericFontDialog::Create(wxWindow*,const wxFontData&)
Create__19wxGenericFontDialogFP8wxWindowRC10wxFontData
;wxGenericFontDialog::ShowModal()
ShowModal__19wxGenericFontDialogFv
;wxGenericFontDialog::sm_eventTableEntries
sm_eventTableEntries__19wxGenericFontDialog
;wxGenericFontDialog::sm_eventTable
sm_eventTable__19wxGenericFontDialog
;wxFontWeightIntToString(int)
wxFontWeightIntToString__Fi
;wxFontPreviewer::GetEventTable() const
GetEventTable__15wxFontPreviewerCFv
;wxConstructorForwxGenericFontDialog()
wxConstructorForwxGenericFontDialog__Fv
;wxFontFamilyStringToInt(char*)
wxFontFamilyStringToInt__FPc
;wxFontStyleStringToInt(char*)
wxFontStyleStringToInt__FPc
;wxGenericFontDialog::wxGenericFontDialog()
__ct__19wxGenericFontDialogFv
;wxFontPreviewer::sm_eventTableEntries
sm_eventTableEntries__15wxFontPreviewer
;wxGenericFontDialog::InitializeFont()
InitializeFont__19wxGenericFontDialogFv
;wxGenericFontDialog::CreateWidgets()
CreateWidgets__19wxGenericFontDialogFv
;wxGenericFontDialog::sm_classwxGenericFontDialog
sm_classwxGenericFontDialog__19wxGenericFontDialog
;From object file: ..\generic\fdrepdlg.cpp ;From object file: ..\generic\fdrepdlg.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxFindReplaceDialog::OnFind(wxCommandEvent&) ;wxFindReplaceDialog::OnFind(wxCommandEvent&)
@@ -10343,6 +10291,8 @@ EXPORTS
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxTextEntryDialog::OnOK(wxCommandEvent&) ;wxTextEntryDialog::OnOK(wxCommandEvent&)
OnOK__17wxTextEntryDialogFR14wxCommandEvent OnOK__17wxTextEntryDialogFR14wxCommandEvent
;wxTextEntryDialog::SetTextValidator(long)
SetTextValidator__17wxTextEntryDialogFl
;wxTextEntryDialog::sm_classwxTextEntryDialog ;wxTextEntryDialog::sm_classwxTextEntryDialog
sm_classwxTextEntryDialog__17wxTextEntryDialog sm_classwxTextEntryDialog__17wxTextEntryDialog
;wxTextEntryDialog::SetValue(const wxString&) ;wxTextEntryDialog::SetValue(const wxString&)
@@ -10354,6 +10304,8 @@ EXPORTS
;wxTextEntryDialog::wxTextEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,const wxPoint&) ;wxTextEntryDialog::wxTextEntryDialog(wxWindow*,const wxString&,const wxString&,const wxString&,long,const wxPoint&)
__ct__17wxTextEntryDialogFP8wxWindowRC8wxStringN22lRC7wxPoint __ct__17wxTextEntryDialogFP8wxWindowRC8wxStringN22lRC7wxPoint
__vft17wxTextEntryDialog8wxObject __vft17wxTextEntryDialog8wxObject
;wxTextEntryDialog::SetTextValidator(wxTextValidator&)
SetTextValidator__17wxTextEntryDialogFR15wxTextValidator
;wxTextEntryDialog::sm_eventTable ;wxTextEntryDialog::sm_eventTable
sm_eventTable__17wxTextEntryDialog sm_eventTable__17wxTextEntryDialog
;From object file: ..\generic\tipdlg.cpp ;From object file: ..\generic\tipdlg.cpp
@@ -10684,6 +10636,8 @@ EXPORTS
DisplaySection__20wxHtmlHelpControllerFi DisplaySection__20wxHtmlHelpControllerFi
;wxHtmlHelpController::DestroyHelpWindow() ;wxHtmlHelpController::DestroyHelpWindow()
DestroyHelpWindow__20wxHtmlHelpControllerFv DestroyHelpWindow__20wxHtmlHelpControllerFv
;wxHtmlHelpController::AddGrabIfNeeded()
AddGrabIfNeeded__20wxHtmlHelpControllerFv
;wxHtmlHelpController::AddBook(const wxString&,unsigned long) ;wxHtmlHelpController::AddBook(const wxString&,unsigned long)
AddBook__20wxHtmlHelpControllerFRC8wxStringUl AddBook__20wxHtmlHelpControllerFRC8wxStringUl
__vft20wxHtmlHelpController8wxObject __vft20wxHtmlHelpController8wxObject
@@ -10693,8 +10647,14 @@ EXPORTS
Quit__20wxHtmlHelpControllerFv Quit__20wxHtmlHelpControllerFv
;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&) ;wxHtmlHelpController::ReadCustomization(wxConfigBase*,const wxString&)
ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString ReadCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
;wxHtmlHelpController::KeywordSearch(const wxString&)
KeywordSearch__20wxHtmlHelpControllerFRC8wxString
;wxHtmlHelpController::Display(int)
Display__20wxHtmlHelpControllerFi
;wxHtmlHelpController::sm_classwxHtmlHelpController ;wxHtmlHelpController::sm_classwxHtmlHelpController
sm_classwxHtmlHelpController__20wxHtmlHelpController sm_classwxHtmlHelpController__20wxHtmlHelpController
;wxHtmlHelpController::Display(const wxString&)
Display__20wxHtmlHelpControllerFRC8wxString
;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&) ;wxHtmlHelpController::WriteCustomization(wxConfigBase*,const wxString&)
WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString WriteCustomization__20wxHtmlHelpControllerFP12wxConfigBaseRC8wxString
;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&) ;wxHtmlHelpController::UseConfig(wxConfigBase*,const wxString&)
@@ -10711,6 +10671,10 @@ EXPORTS
OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent OnCloseFrame__20wxHtmlHelpControllerFR12wxCloseEvent
;wxHtmlHelpController::wxHtmlHelpController(int) ;wxHtmlHelpController::wxHtmlHelpController(int)
__ct__20wxHtmlHelpControllerFi __ct__20wxHtmlHelpControllerFi
;wxHtmlHelpController::DisplayContents()
DisplayContents__20wxHtmlHelpControllerFv
;wxHtmlHelpController::DisplayIndex()
DisplayIndex__20wxHtmlHelpControllerFv
;wxHtmlHelpController::SetTitleFormat(const wxString&) ;wxHtmlHelpController::SetTitleFormat(const wxString&)
SetTitleFormat__20wxHtmlHelpControllerFRC8wxString SetTitleFormat__20wxHtmlHelpControllerFRC8wxString
;wxHtmlHelpController::LoadFile(const wxString&) ;wxHtmlHelpController::LoadFile(const wxString&)
@@ -10821,12 +10785,12 @@ EXPORTS
OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent OnIndexAll__15wxHtmlHelpFrameFR14wxCommandEvent
;wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow*,int,const wxString&,int,wxHtmlHelpData*) ;wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow*,int,const wxString&,int,wxHtmlHelpData*)
__ct__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2P14wxHtmlHelpData __ct__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2P14wxHtmlHelpData
;wxHtmlHelpFrame::DisplayContents()
DisplayContents__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::OptionsDialog()
OptionsDialog__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::Create(wxWindow*,int,const wxString&,int) ;wxHtmlHelpFrame::Create(wxWindow*,int,const wxString&,int)
Create__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2 Create__15wxHtmlHelpFrameFP8wxWindowiRC8wxStringT2
;wxHtmlHelpFrame::OptionsDialog()
OptionsDialog__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::DisplayContents()
DisplayContents__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::CreateIndex() ;wxHtmlHelpFrame::CreateIndex()
CreateIndex__15wxHtmlHelpFrameFv CreateIndex__15wxHtmlHelpFrameFv
;wxHtmlHelpFrameOptionsDialog::sm_eventTableEntries ;wxHtmlHelpFrameOptionsDialog::sm_eventTableEntries
@@ -10837,18 +10801,18 @@ EXPORTS
OnSearch__15wxHtmlHelpFrameFR14wxCommandEvent OnSearch__15wxHtmlHelpFrameFR14wxCommandEvent
;wxHtmlHelpFrame::Init(wxHtmlHelpData*) ;wxHtmlHelpFrame::Init(wxHtmlHelpData*)
Init__15wxHtmlHelpFrameFP14wxHtmlHelpData Init__15wxHtmlHelpFrameFP14wxHtmlHelpData
;wxHtmlHelpFrame::DisplayIndex() ;wxHtmlHelpFrame::NotifyPageChanged()
DisplayIndex__15wxHtmlHelpFrameFv NotifyPageChanged__15wxHtmlHelpFrameFv
;wxConstructorForwxHtmlHelpFrame() ;wxConstructorForwxHtmlHelpFrame()
wxConstructorForwxHtmlHelpFrame__Fv wxConstructorForwxHtmlHelpFrame__Fv
;wxHtmlHelpFrame::~wxHtmlHelpFrame() ;wxHtmlHelpFrame::~wxHtmlHelpFrame()
__dt__15wxHtmlHelpFrameFv __dt__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::NotifyPageChanged()
NotifyPageChanged__15wxHtmlHelpFrameFv
;wxHtmlHelpFrameOptionsDialog::GetEventTable() const ;wxHtmlHelpFrameOptionsDialog::GetEventTable() const
GetEventTable__28wxHtmlHelpFrameOptionsDialogCFv GetEventTable__28wxHtmlHelpFrameOptionsDialogCFv
;wxHtmlHelpFrame::GetEventTable() const ;wxHtmlHelpFrame::GetEventTable() const
GetEventTable__15wxHtmlHelpFrameCFv GetEventTable__15wxHtmlHelpFrameCFv
;wxHtmlHelpFrame::DisplayIndex()
DisplayIndex__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::CreateSearch() ;wxHtmlHelpFrame::CreateSearch()
CreateSearch__15wxHtmlHelpFrameFv CreateSearch__15wxHtmlHelpFrameFv
;wxHtmlHelpFrame::ReadCustomization(wxConfigBase*,const wxString&) ;wxHtmlHelpFrame::ReadCustomization(wxConfigBase*,const wxString&)
@@ -12894,8 +12858,10 @@ EXPORTS
GetEventTable__7wxFrameCFv GetEventTable__7wxFrameCFv
;wxFrame::DetachMenuBar() ;wxFrame::DetachMenuBar()
DetachMenuBar__7wxFrameFv DetachMenuBar__7wxFrameFv
wxFrameMainWndProc ;wxFrame::OnCreateToolBar(long,int,const wxString&)
OnCreateToolBar__7wxFrameFliRC8wxString
wxFrameWndProc wxFrameWndProc
wxFrameMainWndProc
;wxFrame::SetClient(wxWindow*) ;wxFrame::SetClient(wxWindow*)
SetClient__7wxFrameFP8wxWindow SetClient__7wxFrameFP8wxWindow
;From object file: ..\os2\gauge.cpp ;From object file: ..\os2\gauge.cpp
@@ -14751,16 +14717,18 @@ EXPORTS
CreateTool__9wxToolBarFP9wxControl CreateTool__9wxToolBarFP9wxControl
;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long) ;wxToolBar::DoToggleTool(wxToolBarToolBase*,unsigned long)
DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl DoToggleTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::SpringUpButton(int)
SpringUpButton__9wxToolBarFi
;wxToolBar::Init() ;wxToolBar::Init()
Init__9wxToolBarFv Init__9wxToolBarFv
;wxToolBar::sm_eventTable ;wxToolBar::sm_eventTable
sm_eventTable__9wxToolBar sm_eventTable__9wxToolBar
;wxToolBar::GetToolSize() const
GetToolSize__9wxToolBarCFv
;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&) ;wxToolBar::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxString&)
Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString Create__9wxToolBarFP8wxWindowiRC7wxPointRC6wxSizelRC8wxString
;wxToolBar::OS2Command(unsigned int,unsigned short) ;wxToolBar::OnKillFocus(wxFocusEvent&)
OS2Command__9wxToolBarFUiUs OnKillFocus__9wxToolBarFR12wxFocusEvent
;wxToolBar::LowerTool(wxToolBarToolBase*,unsigned long)
LowerTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*) ;wxToolBar::DoInsertTool(unsigned int,wxToolBarToolBase*)
DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase DoInsertTool__9wxToolBarFUiP17wxToolBarToolBase
;wxToolBar::Realize() ;wxToolBar::Realize()
@@ -14769,37 +14737,43 @@ EXPORTS
sm_eventTableEntries__9wxToolBar sm_eventTableEntries__9wxToolBar
;wxToolBar::sm_classwxToolBar ;wxToolBar::sm_classwxToolBar
sm_classwxToolBar__9wxToolBar sm_classwxToolBar__9wxToolBar
;wxToolBar::OnPaint(wxPaintEvent&)
OnPaint__9wxToolBarFR12wxPaintEvent
__vft9wxToolBar8wxObject __vft9wxToolBar8wxObject
;wxToolBar::SetToolBitmapSize(const wxSize&) ;wxToolBar::RaiseTool(wxToolBarToolBase*,unsigned long)
SetToolBitmapSize__9wxToolBarFRC6wxSize RaiseTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::DoEnableTool(wxToolBarToolBase*,unsigned long) ;wxToolBar::DrawTool(wxDC&,wxToolBarToolBase*)
DoEnableTool__9wxToolBarFP17wxToolBarToolBaseUl DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
;wxToolBar::OnSize(wxSizeEvent&)
OnSize__9wxToolBarFR11wxSizeEvent
;wxToolBar::OnMouseEvent(wxMouseEvent&) ;wxToolBar::OnMouseEvent(wxMouseEvent&)
OnMouseEvent__9wxToolBarFR12wxMouseEvent OnMouseEvent__9wxToolBarFR12wxMouseEvent
;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long) ;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long)
DoSetToggle__9wxToolBarFP17wxToolBarToolBaseUl DoSetToggle__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::DoDeleteTool(unsigned int,wxToolBarToolBase*) ;wxToolBar::DoEnableTool(wxToolBarToolBase*,unsigned long)
DoDeleteTool__9wxToolBarFUiP17wxToolBarToolBase DoEnableTool__9wxToolBarFP17wxToolBarToolBaseUl
;wxToolBar::DoAddTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,const wxString&,const wxString&,wxObject*,int,int)
DoAddTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindN22P8wxObjectN21
;wxToolBar::SetRows(int) ;wxToolBar::SetRows(int)
SetRows__9wxToolBarFi SetRows__9wxToolBarFi
;wxToolBar::FindToolForPosition(int,int) const ;wxToolBar::FindToolForPosition(int,int) const
FindToolForPosition__9wxToolBarCFiT1 FindToolForPosition__9wxToolBarCFiT1
;wxToolBar::DrawTool(wxToolBarToolBase*)
DrawTool__9wxToolBarFP17wxToolBarToolBase
;wxToolBar::DoDeleteTool(unsigned int,wxToolBarToolBase*)
DoDeleteTool__9wxToolBarFUiP17wxToolBarToolBase
;wxToolBar::GetEventTable() const ;wxToolBar::GetEventTable() const
GetEventTable__9wxToolBarCFv GetEventTable__9wxToolBarCFv
;wxToolBar::OS2WindowProc(unsigned int,void*,void*)
OS2WindowProc__9wxToolBarFUiPvT2
;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&) ;wxToolBar::CreateTool(int,const wxString&,const wxBitmap&,const wxBitmap&,wxItemKind,wxObject*,const wxString&,const wxString&)
CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22 CreateTool__9wxToolBarFiRC8wxStringRC8wxBitmapT310wxItemKindP8wxObjectN22
;wxToolBar::OnSysColourChanged(wxSysColourChangedEvent&) ;wxDisableBitmap(const wxBitmap&,long)
OnSysColourChanged__9wxToolBarFR23wxSysColourChangedEvent wxDisableBitmap__FRC8wxBitmapl
;wxConstructorForwxToolBar() ;wxConstructorForwxToolBar()
wxConstructorForwxToolBar__Fv wxConstructorForwxToolBar__Fv
;wxToolBar::m_bInitialized
m_bInitialized__9wxToolBar
;wxToolBar::~wxToolBar() ;wxToolBar::~wxToolBar()
__dt__9wxToolBarFv __dt__9wxToolBarFv
;wxToolBar::UpdateSize()
UpdateSize__9wxToolBarFv
;wxToolBar::OS2OnNotify(int,void*,void**)
OS2OnNotify__9wxToolBarFiPvPPv
;From object file: ..\os2\tooltip.cpp ;From object file: ..\os2\tooltip.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxToolTip::wxToolTip(const wxString&) ;wxToolTip::wxToolTip(const wxString&)