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

Catching up for the week

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-05-21 04:20:43 +00:00
parent 72b4f026a2
commit b63b737dc8
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/os2/fontdlg.cpp
View File

@@ -45,17 +45,16 @@ wxFontDialog::wxFontDialog()
m_dialogParent = NULL; m_dialogParent = NULL;
} }
wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data) wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData& rData)
{ {
Create(parent, data); Create(parent, rData);
} }
bool wxFontDialog::Create(wxWindow *parent, wxFontData *data) bool wxFontDialog::Create(wxWindow *parent, const wxFontData& rData)
{ {
m_dialogParent = parent; m_dialogParent = parent;
if (data) m_fontData = rData;
m_fontData = *data;
return TRUE; return TRUE;
} }

11
src/os2/ownerdrw.cpp
View File

@@ -365,11 +365,10 @@ bool wxOwnerDrawn::OnDrawItem(
// //
wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height)); wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height));
// int nHeightDiff = m_nHeight - nBmpHeight;
//MT: blit with mask enabled.
//
rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2
,rRect.y + (m_nHeight - nBmpHeight) /2 ,rRect.y + nHeightDiff / 2
,nBmpWidth ,nBmpWidth
,nBmpHeight ,nBmpHeight
,&vDCMem ,&vDCMem
@@ -383,8 +382,8 @@ bool wxOwnerDrawn::OnDrawItem(
{ {
RECT vRectBmp = { rRect.x RECT vRectBmp = { rRect.x
,rRect.y ,rRect.y
,rRect.x + GetMarginWidth() ,rRect.x + GetMarginWidth() - 1
,rRect.y + m_nHeight ,rRect.y + m_nHeight - 1
}; };
POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border
POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3}; POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3};

34
src/os2/wx23.def
View File

@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
CODE LOADONCALL CODE LOADONCALL
EXPORTS EXPORTS
;From library: H:\Dev\Wx2\WxWindows\lib\wx.lib ;From library: F:\DEV\WX2\WXWINDOWS\LIB\wx.lib
;From object file: dummy.cpp ;From object file: dummy.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
wxDummyChar wxDummyChar
@@ -1940,7 +1940,7 @@ EXPORTS
wxEVT_NC_LEFT_DCLICK wxEVT_NC_LEFT_DCLICK
wxEVT_INIT_DIALOG wxEVT_INIT_DIALOG
wxEVT_COMMAND_SET_FOCUS 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): ;PUBDEFs (Symbols available from object file):
ConvertToIeeeExtended ConvertToIeeeExtended
ConvertFromIeeeExtended ConvertFromIeeeExtended
@@ -4486,6 +4486,8 @@ EXPORTS
Create__17wxPopupWindowBaseFP8wxWindowi Create__17wxPopupWindowBaseFP8wxWindowi
;wxPopupWindowBase::~wxPopupWindowBase() ;wxPopupWindowBase::~wxPopupWindowBase()
__dt__17wxPopupWindowBaseFv __dt__17wxPopupWindowBaseFv
;wxConstructorForwxPopupWindow()
wxConstructorForwxPopupWindow__Fv
;wxPopupTransientWindow::OnDismiss() ;wxPopupTransientWindow::OnDismiss()
OnDismiss__22wxPopupTransientWindowFv OnDismiss__22wxPopupTransientWindowFv
;wxPopupTransientWindow::DismissAndNotify() ;wxPopupTransientWindow::DismissAndNotify()
@@ -4500,6 +4502,8 @@ EXPORTS
__dt__22wxPopupTransientWindowFv __dt__22wxPopupTransientWindowFv
;wxPopupTransientWindow::PopHandlers() ;wxPopupTransientWindow::PopHandlers()
PopHandlers__22wxPopupTransientWindowFv PopHandlers__22wxPopupTransientWindowFv
;wxPopupWindow::sm_classwxPopupWindow
sm_classwxPopupWindow__13wxPopupWindow
;From object file: ..\common\prntbase.cpp ;From object file: ..\common\prntbase.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxPreviewControlBar::OnZoom(wxCommandEvent&) ;wxPreviewControlBar::OnZoom(wxCommandEvent&)
@@ -5042,10 +5046,10 @@ EXPORTS
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxSystemSettings::ms_screen ;wxSystemSettings::ms_screen
ms_screen__16wxSystemSettings ms_screen__16wxSystemSettings
;wxSystemSettings::SetScreen(wxSystemScreen)
SetScreen__16wxSystemSettingsF14wxSystemScreen
;wxSystemSettings::GetScreenType() ;wxSystemSettings::GetScreenType()
GetScreen__16wxSystemSettingsFv GetScreenType__16wxSystemSettingsFv
;wxSystemSettings::SetScreenType(wxSystemScreenType)
SetScreenType__16wxSystemSettingsF18wxSystemScreenType
;From object file: ..\common\sizer.cpp ;From object file: ..\common\sizer.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*) ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -6138,7 +6142,7 @@ EXPORTS
Read32__17wxTextInputStreamFv Read32__17wxTextInputStreamFv
;wxTextInputStream::SkipIfEndOfLine(char) ;wxTextInputStream::SkipIfEndOfLine(char)
SkipIfEndOfLine__17wxTextInputStreamFc 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): ;PUBDEFs (Symbols available from object file):
unzReadCurrentFile unzReadCurrentFile
unzGetCurrentFileInfo unzGetCurrentFileInfo
@@ -7902,12 +7906,10 @@ EXPORTS
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&) ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*) ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,const wxFontData&)
__ct__19wxGenericFontDialogFP8wxWindowP10wxFontData __ct__19wxGenericFontDialogFP8wxWindowRC10wxFontData
;wxFontStyleIntToString(int) ;wxFontStyleIntToString(int)
wxFontStyleIntToString__Fi wxFontStyleIntToString__Fi
;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
;wxGenericFontDialog::GetEventTable() const ;wxGenericFontDialog::GetEventTable() const
GetEventTable__19wxGenericFontDialogCFv GetEventTable__19wxGenericFontDialogCFv
;wxFontPreviewer::sm_eventTable ;wxFontPreviewer::sm_eventTable
@@ -7924,6 +7926,8 @@ EXPORTS
OnPaint__15wxFontPreviewerFR12wxPaintEvent OnPaint__15wxFontPreviewerFR12wxPaintEvent
;wxGenericFontDialog::OnChangeFont(wxCommandEvent&) ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
;wxGenericFontDialog::Create(wxWindow*,const wxFontData&)
Create__19wxGenericFontDialogFP8wxWindowRC10wxFontData
;wxGenericFontDialog::ShowModal() ;wxGenericFontDialog::ShowModal()
ShowModal__19wxGenericFontDialogFv ShowModal__19wxGenericFontDialogFv
;wxGenericFontDialog::sm_eventTableEntries ;wxGenericFontDialog::sm_eventTableEntries
@@ -10093,6 +10097,8 @@ EXPORTS
__vft16wxSplitterWindow8wxObject __vft16wxSplitterWindow8wxObject
;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int) ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
;wxSplitterWindow::SetSashPositionAndNotify(int)
SetSashPositionAndNotify__16wxSplitterWindowFi
;wxSplitterWindow::SetMinimumPaneSize(int) ;wxSplitterWindow::SetMinimumPaneSize(int)
SetMinimumPaneSize__16wxSplitterWindowFi SetMinimumPaneSize__16wxSplitterWindowFi
;wxSplitterWindow::OnSashPositionChange(int) ;wxSplitterWindow::OnSashPositionChange(int)
@@ -12754,16 +12760,16 @@ EXPORTS
;wxConstructorForwxFontDialog() ;wxConstructorForwxFontDialog()
wxConstructorForwxFontDialog__Fv wxConstructorForwxFontDialog__Fv
__vft12wxFontDialog8wxObject __vft12wxFontDialog8wxObject
;wxFontDialog::wxFontDialog(wxWindow*,wxFontData*) ;wxFontDialog::Create(wxWindow*,const wxFontData&)
__ct__12wxFontDialogFP8wxWindowP10wxFontData Create__12wxFontDialogFP8wxWindowRC10wxFontData
;wxFontDialog::wxFontDialog(wxWindow*,const wxFontData&)
__ct__12wxFontDialogFP8wxWindowRC10wxFontData
;wxFontDialog::wxFontDialog() ;wxFontDialog::wxFontDialog()
__ct__12wxFontDialogFv __ct__12wxFontDialogFv
;wxFontDialog::ShowModal() ;wxFontDialog::ShowModal()
ShowModal__12wxFontDialogFv ShowModal__12wxFontDialogFv
;wxFontDialog::sm_classwxFontDialog ;wxFontDialog::sm_classwxFontDialog
sm_classwxFontDialog__12wxFontDialog sm_classwxFontDialog__12wxFontDialog
;wxFontDialog::Create(wxWindow*,wxFontData*)
Create__12wxFontDialogFP8wxWindowP10wxFontData
;From object file: ..\os2\fontenum.cpp ;From object file: ..\os2\fontenum.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long) ;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long)