Catching up for the week

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/fontdlg.cpp b/src/os2/fontdlg.cpp
index 065949e3c18e9bbd7fb63e4feab7a1138a83ae53..56afb1cc61b7d1b85b856f4099711618c76c2288 100644 (file)
--- a/src/os2/fontdlg.cpp
+++ b/src/os2/fontdlg.cpp
@@ -45,17 +45,16 @@ wxFontDialog::wxFontDialog()
     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;
 
-    if (data)
-        m_fontData = *data;
+    m_fontData = rData;
     return TRUE;
 }
 

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

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index dbe5e93877a8c8ba3a37f4ef8d4adee7006cae5b..d647fdcadd355696f83e31e5722e72e5ea6df0a8 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -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
@@ -1940,7 +1940,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
@@ -4486,6 +4486,8 @@ EXPORTS
       Create__17wxPopupWindowBaseFP8wxWindowi
       ;wxPopupWindowBase::~wxPopupWindowBase()
       __dt__17wxPopupWindowBaseFv
+      ;wxConstructorForwxPopupWindow()
+      wxConstructorForwxPopupWindow__Fv
       ;wxPopupTransientWindow::OnDismiss()
       OnDismiss__22wxPopupTransientWindowFv
       ;wxPopupTransientWindow::DismissAndNotify()
@@ -4500,6 +4502,8 @@ EXPORTS
       __dt__22wxPopupTransientWindowFv
       ;wxPopupTransientWindow::PopHandlers()
       PopHandlers__22wxPopupTransientWindowFv
+      ;wxPopupWindow::sm_classwxPopupWindow
+      sm_classwxPopupWindow__13wxPopupWindow
   ;From object file:  ..\common\prntbase.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxPreviewControlBar::OnZoom(wxCommandEvent&)
@@ -5042,10 +5046,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxSystemSettings::ms_screen
       ms_screen__16wxSystemSettings
-      ;wxSystemSettings::SetScreen(wxSystemScreen)
-      SetScreen__16wxSystemSettingsF14wxSystemScreen
       ;wxSystemSettings::GetScreenType()
-      GetScreen__16wxSystemSettingsFv
+      GetScreenType__16wxSystemSettingsFv
+      ;wxSystemSettings::SetScreenType(wxSystemScreenType)
+      SetScreenType__16wxSystemSettingsF18wxSystemScreenType
   ;From object file:  ..\common\sizer.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxSizerItem::wxSizerItem(int,int,int,int,int,wxObject*)
@@ -6138,7 +6142,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
@@ -7902,12 +7906,10 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       ;wxGenericFontDialog::OnCloseWindow(wxCloseEvent&)
       OnCloseWindow__19wxGenericFontDialogFR12wxCloseEvent
-      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,wxFontData*)
-      __ct__19wxGenericFontDialogFP8wxWindowP10wxFontData
+      ;wxGenericFontDialog::wxGenericFontDialog(wxWindow*,const wxFontData&)
+      __ct__19wxGenericFontDialogFP8wxWindowRC10wxFontData
       ;wxFontStyleIntToString(int)
       wxFontStyleIntToString__Fi
-      ;wxGenericFontDialog::Create(wxWindow*,wxFontData*)
-      Create__19wxGenericFontDialogFP8wxWindowP10wxFontData
       ;wxGenericFontDialog::GetEventTable() const
       GetEventTable__19wxGenericFontDialogCFv
       ;wxFontPreviewer::sm_eventTable
@@ -7924,6 +7926,8 @@ EXPORTS
       OnPaint__15wxFontPreviewerFR12wxPaintEvent
       ;wxGenericFontDialog::OnChangeFont(wxCommandEvent&)
       OnChangeFont__19wxGenericFontDialogFR14wxCommandEvent
+      ;wxGenericFontDialog::Create(wxWindow*,const wxFontData&)
+      Create__19wxGenericFontDialogFP8wxWindowRC10wxFontData
       ;wxGenericFontDialog::ShowModal()
       ShowModal__19wxGenericFontDialogFv
       ;wxGenericFontDialog::sm_eventTableEntries
@@ -10093,6 +10097,8 @@ EXPORTS
       __vft16wxSplitterWindow8wxObject
       ;wxSplitterWindow::DoSplit(wxSplitMode,wxWindow*,wxWindow*,int)
       DoSplit__16wxSplitterWindowF11wxSplitModeP8wxWindowT2i
+      ;wxSplitterWindow::SetSashPositionAndNotify(int)
+      SetSashPositionAndNotify__16wxSplitterWindowFi
       ;wxSplitterWindow::SetMinimumPaneSize(int)
       SetMinimumPaneSize__16wxSplitterWindowFi
       ;wxSplitterWindow::OnSashPositionChange(int)
@@ -12754,16 +12760,16 @@ EXPORTS
       ;wxConstructorForwxFontDialog()
       wxConstructorForwxFontDialog__Fv
       __vft12wxFontDialog8wxObject
-      ;wxFontDialog::wxFontDialog(wxWindow*,wxFontData*)
-      __ct__12wxFontDialogFP8wxWindowP10wxFontData
+      ;wxFontDialog::Create(wxWindow*,const wxFontData&)
+      Create__12wxFontDialogFP8wxWindowRC10wxFontData
+      ;wxFontDialog::wxFontDialog(wxWindow*,const wxFontData&)
+      __ct__12wxFontDialogFP8wxWindowRC10wxFontData
       ;wxFontDialog::wxFontDialog()
       __ct__12wxFontDialogFv
       ;wxFontDialog::ShowModal()
       ShowModal__12wxFontDialogFv
       ;wxFontDialog::sm_classwxFontDialog
       sm_classwxFontDialog__12wxFontDialog
-      ;wxFontDialog::Create(wxWindow*,wxFontData*)
-      Create__12wxFontDialogFP8wxWindowP10wxFontData
   ;From object file:  ..\os2\fontenum.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxFontEnumerator::EnumerateFacenames(wxFontEncoding,unsigned long)