From d0a6b27997bc37c69ebae7e5a6e84d0b1b816970 Mon Sep 17 00:00:00 2001
From: David Webster <Dave.Webster@bhmi.com>
Date: Wed, 9 Jan 2002 23:22:53 +0000
Subject: [PATCH] Consildation and cleanup of global variables.  Mostly all
 delclared and all defined in one header and module.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/os2/app.cpp      |  10 ----
 src/os2/data.cpp     |  88 +++++++++++++++++-------------
 src/os2/font.cpp     |  11 ++++
 src/os2/frame.cpp    |   1 -
 src/os2/mdi.cpp      |   2 -
 src/os2/toplevel.cpp |   2 -
 src/os2/utilsexc.cpp |   2 -
 src/os2/window.cpp   |   3 --
 src/os2/wx23.def     | 124 ++++++++++++++++++++++++-------------------
 9 files changed, 131 insertions(+), 112 deletions(-)

diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index cdc874ea90..5d137de3d3 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -96,16 +96,6 @@ HAB                                 vHabmain = NULLHANDLE;
 QMSG                                svCurrentMsg;
 wxApp*                              wxTheApp = NULL;
 
-// NB: all "NoRedraw" classes must have the same names as the "normal" classes
-//     with NR suffix - wxWindow::OS2Create() supposes this
-wxChar wxFrameClassName[]                 = wxT("wxFrameClass");
-wxChar wxFrameClassNameNoRedraw[]         = wxT("wxFrameClassNR");
-wxChar wxMDIFrameClassName[]              = wxT("wxMDIFrameClass");
-wxChar wxMDIFrameClassNameNoRedraw[]      = wxT("wxMDIFrameClassNR");
-wxChar wxMDIChildFrameClassName[]         = wxT("wxMDIChildFrameClass");
-wxChar wxMDIChildFrameClassNameNoRedraw[] = wxT("wxMDIChildFrameClassNR");
-wxChar wxPanelClassName[]                 = wxT("wxPanelClass");
-wxChar wxCanvasClassName[]                = wxT("wxCanvasClass");
 
 HICON wxSTD_FRAME_ICON          = (HICON) NULL;
 HICON wxSTD_MDICHILDFRAME_ICON  = (HICON) NULL;
diff --git a/src/os2/data.cpp b/src/os2/data.cpp
index 03f4aabf10..be9f7d2428 100644
--- a/src/os2/data.cpp
+++ b/src/os2/data.cpp
@@ -98,43 +98,59 @@ wxFont   wxNullFont;
 wxColour wxNullColour;
 wxNativeFontInfo wxNullNativeFontInfo;
 
+//
 // Default window names
-const wxChar *wxButtonNameStr = wxT("button");
-const wxChar *wxCanvasNameStr = wxT("canvas");
-const wxChar *wxCheckBoxNameStr = wxT("check");
-const wxChar *wxChoiceNameStr = wxT("choice");
-const wxChar *wxComboBoxNameStr = wxT("comboBox");
-const wxChar *wxDialogNameStr = wxT("dialog");
-const wxChar *wxFrameNameStr = wxT("frame");
-const wxChar *wxGaugeNameStr = wxT("gauge");
-const wxChar *wxStaticBoxNameStr = wxT("groupBox");
-const wxChar *wxListBoxNameStr = wxT("listBox");
-const wxChar *wxStaticTextNameStr = wxT("message");
-const wxChar *wxStaticBitmapNameStr = wxT("message");
-const wxChar *wxMultiTextNameStr = wxT("multitext");
-const wxChar *wxPanelNameStr = wxT("panel");
-const wxChar *wxRadioBoxNameStr = wxT("radioBox");
-const wxChar *wxRadioButtonNameStr = wxT("radioButton");
-const wxChar *wxBitmapRadioButtonNameStr = wxT("radioButton");
-const wxChar *wxScrollBarNameStr = wxT("scrollBar");
-const wxChar *wxSliderNameStr = wxT("slider");
-const wxChar *wxStaticNameStr = wxT("static");
-const wxChar *wxTextCtrlWindowNameStr = wxT("textWindow");
-const wxChar *wxTextCtrlNameStr = wxT("text");
-const wxChar *wxVirtListBoxNameStr = wxT("virtListBox");
-const wxChar *wxButtonBarNameStr = wxT("buttonbar");
-const wxChar *wxEnhDialogNameStr = wxT("Shell");
-const wxChar *wxToolBarNameStr = wxT("toolbar");
-const wxChar *wxStatusLineNameStr = wxT("status_line");
-const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text");
-const wxChar *wxMessageBoxCaptionStr = wxT("Message");
-const wxChar *wxFileSelectorPromptStr = wxT("Select a file");
-const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*.*");
-const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error");
-const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error");
-const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl");
-const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl");
-const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
+//
+const wxChar*                       wxButtonNameStr                  = wxT("button");
+const wxChar*                       wxCanvasNameStr                  = wxT("canvas");
+const wxChar*                       wxCheckBoxNameStr                = wxT("check");
+const wxChar*                       wxChoiceNameStr                  = wxT("choice");
+const wxChar*                       wxComboBoxNameStr                = wxT("comboBox");
+const wxChar*                       wxDialogNameStr                  = wxT("dialog");
+const wxChar*                       wxFrameNameStr                   = wxT("frame");
+const wxChar*                       wxGaugeNameStr                   = wxT("gauge");
+const wxChar*                       wxStaticBoxNameStr               = wxT("groupBox");
+const wxChar*                       wxListBoxNameStr                 = wxT("listBox");
+const wxChar*                       wxStaticTextNameStr              = wxT("message");
+const wxChar*                       wxStaticBitmapNameStr            = wxT("message");
+const wxChar*                       wxMultiTextNameStr               = wxT("multitext");
+const wxChar*                       wxPanelNameStr                   = wxT("panel");
+const wxChar*                       wxRadioBoxNameStr                = wxT("radioBox");
+const wxChar*                       wxRadioButtonNameStr             = wxT("radioButton");
+const wxChar*                       wxBitmapRadioButtonNameStr       = wxT("radioButton");
+const wxChar*                       wxScrollBarNameStr               = wxT("scrollBar");
+const wxChar*                       wxSliderNameStr                  = wxT("slider");
+const wxChar*                       wxStaticNameStr                  = wxT("static");
+const wxChar*                       wxTextCtrlWindowNameStr          = wxT("textWindow");
+const wxChar*                       wxTextCtrlNameStr                = wxT("text");
+const wxChar*                       wxVirtListBoxNameStr             = wxT("virtListBox");
+const wxChar*                       wxButtonBarNameStr               = wxT("buttonbar");
+const wxChar*                       wxEnhDialogNameStr               = wxT("Shell");
+const wxChar*                       wxToolBarNameStr                 = wxT("toolbar");
+const wxChar*                       wxStatusLineNameStr              = wxT("status_line");
+const wxChar*                       wxGetTextFromUserPromptStr       = wxT("Input Text");
+const wxChar*                       wxMessageBoxCaptionStr           = wxT("Message");
+const wxChar*                       wxFileSelectorPromptStr          = wxT("Select a file");
+const wxChar*                       wxFileSelectorDefaultWildcardStr = wxT("*.*");
+const wxChar*                       wxInternalErrorStr               = wxT("wxWindows Internal Error");
+const wxChar*                       wxFatalErrorStr                  = wxT("wxWindows Fatal Error");
+const wxChar*                       wxTreeCtrlNameStr                = wxT("treeCtrl");
+const wxChar*                       wxDirDialogNameStr               = wxT("wxDirCtrl");
+const wxChar*                       wxDirDialogDefaultFolderStr      = wxT("/");
+
+//
+// Class names
+//
+const wxChar*                       wxFrameClassName                 = wxT("wxFrameClass");
+const wxChar*                       wxFrameClassNameNoRedraw         = wxT("wxFrameClassNR");
+const wxChar*                       wxMDIFrameClassName              = wxT("wxMDIFrameClass");
+const wxChar*                       wxMDIFrameClassNameNoRedraw      = wxT("wxMDIFrameClassNR");
+const wxChar*                       wxMDIChildFrameClassName         = wxT("wxMDIChildFrameClass");
+const wxChar*                       wxMDIChildFrameClassNameNoRedraw = wxT("wxMDIChildFrameClassNR");
+const wxChar*                       wxPanelClassName                 = wxT("wxPanelClass");
+const wxChar*                       wxPanelClassNameNR               = wxT("wxPanelClassNR");
+const wxChar*                       wxCanvasClassName                = wxT("wxCanvasClass");
+const wxChar*                       wxCanvasClassNameNR              = wxT("wxCanvasClassNR");
 
 // See wx/utils.h
 const wxChar *wxFloatToStringStr = wxT("%.2f");
diff --git a/src/os2/font.cpp b/src/os2/font.cpp
index 6c4c32653c..623f7fd444 100644
--- a/src/os2/font.cpp
+++ b/src/os2/font.cpp
@@ -1085,3 +1085,14 @@ void wxFont::SetFM(
 } // end of wxFont::SetFM
 
 
+void wxFont::SetPS(
+  HPS                               hPS
+)
+{
+    Unshare();
+
+    M_FONTDATA->SetPS(hPS);
+
+    RealizeResource();
+} // end of wxFont::SetUnderlined
+
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 55c626ed14..978eb7c13d 100644
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -52,7 +52,6 @@
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;
-extern const wxChar* wxFrameClassName;
 
 #if wxUSE_MENUS_NATIVE
 extern wxMenu *wxCurrentPopupMenu;
diff --git a/src/os2/mdi.cpp b/src/os2/mdi.cpp
index c60552cdaf..59a2fc778d 100644
--- a/src/os2/mdi.cpp
+++ b/src/os2/mdi.cpp
@@ -37,8 +37,6 @@
 extern wxWindowList wxModelessWindows;      // from dialog.cpp
 extern wxMenu *wxCurrentPopupMenu;
 
-extern wxChar wxMDIFrameClassName[];
-extern wxChar wxMDIChildFrameClassName[];
 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp
index 3f5b059d66..b135598646 100644
--- a/src/os2/toplevel.cpp
+++ b/src/os2/toplevel.cpp
@@ -52,8 +52,6 @@
 wxWindowList wxModelessWindows;
 
 // the name of the default wxWindows class
-extern const wxChar* wxCanvasClassName;
-extern const wxChar* wxFrameClassName;
 extern void          wxAssociateWinWithHandle( HWND         hWnd
                                               ,wxWindowOS2* pWin
                                              );
diff --git a/src/os2/utilsexc.cpp b/src/os2/utilsexc.cpp
index f9f3885e16..7319510797 100644
--- a/src/os2/utilsexc.cpp
+++ b/src/os2/utilsexc.cpp
@@ -130,8 +130,6 @@ MRESULT APIENTRY wxExecuteWindowCbk(
     return 0;
 }
 
-extern wxChar wxPanelClassName[];
-
 long wxExecute(
   const wxString&                   rCommand
 , bool                              bSync
diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 9ffc8921ef..eecbf1479c 100644
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -102,9 +102,6 @@ QMSG                      s_currentMsg;
 wxMenu*                   wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS_NATIVE
 
-#if !defined(__VISAGECPP__) || (__IBMCPP__ < 400)
-extern wxChar             wxCanvasClassName[];
-#endif
 wxList*                   wxWinHandleList = NULL;
 
 // ---------------------------------------------------------------------------
diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index b95b899bfc..8db2495a9a 100644
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -2193,22 +2193,14 @@ EXPORTS
       OpenFile__12wxFileSystemFRC8wxString
   ;From object file:  ..\common\fontcmn.cpp
     ;PUBDEFs (Symbols available from object file):
-      ;wxNativeFontInfo::SetUnderlined(unsigned long)
-      SetUnderlined__16wxNativeFontInfoFUl
       ;wxFontBase::GetNativeFontInfo() const
       GetNativeFontInfo__10wxFontBaseCFv
-      ;wxNativeFontInfo::GetUnderlined() const
-      GetUnderlined__16wxNativeFontInfoCFv
       ;wxFontBase::New(const wxNativeFontInfo&)
       New__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::New(const wxString&)
       New__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::FromString(const wxString&)
-      FromString__16wxNativeFontInfoFRC8wxString
       ;wxFont::operator=(const wxFont&)
       __as__6wxFontFRC6wxFont
-      ;wxNativeFontInfo::SetFamily(wxFontFamily)
-      SetFamily__16wxNativeFontInfoF12wxFontFamily
       ;wxFontBase::GetNativeFontInfoDesc() const
       GetNativeFontInfoDesc__10wxFontBaseCFv
       ;wxNativeFontInfo::ToUserString() const
@@ -2223,45 +2215,19 @@ EXPORTS
       SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
       ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
       SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::SetStyle(wxFontStyle)
-      SetStyle__16wxNativeFontInfoF11wxFontStyle
       ;wxFontBase::ms_encodingDefault
       ms_encodingDefault__10wxFontBase
-      ;wxNativeFontInfo::GetPointSize() const
-      GetPointSize__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetStyle() const
-      GetStyle__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetFamily() const
-      GetFamily__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::GetFaceName() const
-      GetFaceName__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::SetEncoding(wxFontEncoding)
-      SetEncoding__16wxNativeFontInfoF14wxFontEncoding
       ;wxFontBase::SetNativeFontInfo(const wxString&)
       SetNativeFontInfo__10wxFontBaseFRC8wxString
-      ;wxNativeFontInfo::SetWeight(wxFontWeight)
-      SetWeight__16wxNativeFontInfoF12wxFontWeight
+      ;wxFontBase::operator==(const wxFont&) const
+      __eq__10wxFontBaseCFRC6wxFont
       __vft10wxFontBase8wxObject
       ;wxFontBase::operator!=(const wxFont&) const
       __ne__10wxFontBaseCFRC6wxFont
-      ;wxFontBase::operator==(const wxFont&) const
-      __eq__10wxFontBaseCFRC6wxFont
-      ;wxNativeFontInfo::SetPointSize(int)
-      SetPointSize__16wxNativeFontInfoFi
-      ;wxNativeFontInfo::ToString() const
-      ToString__16wxNativeFontInfoCFv
       ;wxFontBase::GetFamilyString() const
       GetFamilyString__10wxFontBaseCFv
-      ;wxNativeFontInfo::GetEncoding() const
-      GetEncoding__16wxNativeFontInfoCFv
-      ;wxNativeFontInfo::Init()
-      Init__16wxNativeFontInfoFv
-      ;wxNativeFontInfo::GetWeight() const
-      GetWeight__16wxNativeFontInfoCFv
       ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
-      ;wxNativeFontInfo::SetFaceName(wxString)
-      SetFaceName__16wxNativeFontInfoF8wxString
       ;wxNativeFontInfo::FromUserString(const wxString&)
       FromUserString__16wxNativeFontInfoFRC8wxString
   ;From object file:  ..\common\fontmap.cpp
@@ -10918,8 +10884,6 @@ EXPORTS
       OnIdle__5wxAppFR11wxIdleEvent
       ;wxMsgArray::wxMsgArray(const wxMsgArray&)
       __ct__10wxMsgArrayFRC10wxMsgArray
-      wxPanelClassName
-      wxMDIFrameClassName
       ;wxMsgArray::Insert(const _QMSG&,unsigned int)
       Insert__10wxMsgArrayFRC5_QMSGUi
       ;wxApp::HandleSockets()
@@ -10956,14 +10920,11 @@ EXPORTS
       Initialized__5wxAppFv
       ;wxApp::GetEventTable() const
       GetEventTable__5wxAppCFv
-      wxFrameClassNameNoRedraw
       ;wxSetInstance(unsigned long)
       wxSetInstance__FUl
       ;wxMsgArray::RemoveAt(unsigned int)
       RemoveAt__10wxMsgArrayFUi
-      wxMDIChildFrameClassName
       wxGetInstance
-      wxFrameClassName
       ;wxApp::GetStdIcon(int) const
       GetStdIcon__5wxAppCFi
       ;wxMsgArray::~wxMsgArray()
@@ -10975,7 +10936,6 @@ EXPORTS
       ;wxApp::CleanUp()
       CleanUp__5wxAppFv
       svCurrentMsg
-      wxMDIChildFrameClassNameNoRedraw
       ;wxMsgArray::Index(const _QMSG&,unsigned long) const
       Index__10wxMsgArrayCFRC5_QMSGUl
       wxDisableButtonBrush
@@ -10985,7 +10945,6 @@ EXPORTS
       Initialize__5wxAppFUl
       ;wxAppBase::m_appInitFn
       m_appInitFn__9wxAppBase
-      wxCanvasClassName
       ;wxApp::DoMessage()
       DoMessage__5wxAppFv
       ;wxExit()
@@ -10996,7 +10955,6 @@ EXPORTS
       Dispatch__5wxAppFv
       ;wxEntry(int,char**)
       wxEntry__FiPPc
-      wxMDIFrameClassNameNoRedraw
       ;wxApp::SendIdleEvents(wxWindow*)
       SendIdleEvents__5wxAppFP8wxWindow
   ;From object file:  ..\os2\bitmap.cpp
@@ -11497,12 +11455,15 @@ EXPORTS
       wxDialogNameStr
       wxCheckBoxNameStr
       wxCanvasNameStr
+      wxCanvasClassNameNR
       wxCYAN_PEN
       wxButtonBarNameStr
       wxNullBitmap
       wxNORMAL_FONT
       wxMEDIUM_GREY_BRUSH
       wxTheColourDatabase
+      wxPanelClassName
+      wxMDIFrameClassName
       wxLIGHT_GREY
       wxDefaultSize
       wxBLUE
@@ -11512,6 +11473,7 @@ EXPORTS
       wxStaticBoxNameStr
       wxSliderNameStr
       wxRED_PEN
+      wxPanelClassNameNR
       wxMultiTextNameStr
       wxMEDIUM_GREY_PEN
       wxGaugeNameStr
@@ -11536,9 +11498,12 @@ EXPORTS
       wxComboBoxNameStr
       wxCROSS_CURSOR
       wxTopLevelWindows
+      wxFrameClassNameNoRedraw
       wxTRANSPARENT_BRUSH
       wxWHITE_BRUSH
       wxRED_BRUSH
+      wxFrameClassName
+      wxMDIChildFrameClassName
       wxNullColour
       wxTRANSPARENT_PEN
       wxStaticNameStr
@@ -11552,11 +11517,13 @@ EXPORTS
       wxBLACK_DASHED_PEN
       g_globalCursor
       wxNullNativeFontInfo
+      wxMDIChildFrameClassNameNoRedraw
       wxBLUE_BRUSH
       wxLIGHT_GREY_BRUSH
       wxBLACK_BRUSH
       wxPendingDelete
       wxNullAcceleratorTable
+      wxCanvasClassName
       wxGREEN_PEN
       wxVirtListBoxNameStr
       wxStatusLineNameStr
@@ -11571,6 +11538,7 @@ EXPORTS
       wxChoiceNameStr
       wxCYAN
       wxBLACK
+      wxMDIFrameClassNameNoRedraw
   ;From object file:  ..\os2\dataobj.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxDataFormat::wxDataFormat()
@@ -12014,12 +11982,18 @@ EXPORTS
       sm_classwxFileDialog__12wxFileDialog
   ;From object file:  ..\os2\font.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxFont::Create(const wxNativeFontInfo&,unsigned long)
+      Create__6wxFontFRC16wxNativeFontInfoUl
+      ;wxNativeFontInfo::SetUnderlined(unsigned long)
+      SetUnderlined__16wxNativeFontInfoFUl
       ;wxFont::SetStyle(int)
       SetStyle__6wxFontFi
-      ;wxFont::OS2SelectMatchingFontByName()
-      OS2SelectMatchingFontByName__6wxFontFv
+      ;wxFontRefData::Init(const wxNativeFontInfo&,unsigned long,unsigned long)
+      Init__13wxFontRefDataFRC16wxNativeFontInfoUlT2
       ;wxFont::IsFree() const
       IsFree__6wxFontCFv
+      ;wxNativeFontInfo::GetUnderlined() const
+      GetUnderlined__16wxNativeFontInfoCFv
       ;wxFont::GetHFONT() const
       GetHFONT__6wxFontCFv
       ;wxFont::GetFamily() const
@@ -12028,9 +12002,15 @@ EXPORTS
       GetFaceName__6wxFontCFv
       ;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding
+      ;wxFont::wxFont(const wxString&)
+      __ct__6wxFontFRC8wxString
+      ;wxNativeFontInfo::FromString(const wxString&)
+      FromString__16wxNativeFontInfoFRC8wxString
+      ;wxNativeFontInfo::SetFamily(wxFontFamily)
+      SetFamily__16wxNativeFontInfoF12wxFontFamily
+      __vft13wxFontRefData15wxObjectRefData
       ;wxFont::SetFamily(int)
       SetFamily__6wxFontFi
-      __vft13wxFontRefData15wxObjectRefData
       ;wxConstructorForwxFont()
       wxConstructorForwxFont__Fv
       ;wxFontRefData::~wxFontRefData()
@@ -12039,6 +12019,8 @@ EXPORTS
       GetUnderlined__6wxFontCFv
       ;wxFont::GetStyle() const
       GetStyle__6wxFontCFv
+      ;wxFont::GetNativeFontInfo() const
+      GetNativeFontInfo__6wxFontCFv
       ;wxFont::SetEncoding(wxFontEncoding)
       SetEncoding__6wxFontF14wxFontEncoding
       ;wxFont::FreeResource(unsigned long)
@@ -12047,27 +12029,51 @@ EXPORTS
       SetUnderlined__6wxFontFUl
       ;wxFont::SetPS(unsigned long)
       SetPS__6wxFontFUl
-      ;wxFont::GetFontId() const
-      GetFontId__6wxFontCFv
-      ;wxFont::GetPS() const
-      GetPS__6wxFontCFv
+      ;wxNativeFontInfo::SetStyle(wxFontStyle)
+      SetStyle__16wxNativeFontInfoF11wxFontStyle
+      ;wxNativeFontInfo::GetPointSize() const
+      GetPointSize__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetStyle() const
+      GetStyle__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFamily() const
+      GetFamily__16wxNativeFontInfoCFv
+      ;wxNativeFontInfo::GetFaceName() const
+      GetFaceName__16wxNativeFontInfoCFv
       ;wxFont::GetEncoding() const
       GetEncoding__6wxFontCFv
+      ;wxNativeFontInfo::SetEncoding(wxFontEncoding)
+      SetEncoding__16wxNativeFontInfoF14wxFontEncoding
+      ;wxFont::SetNativeFontInfo(const wxNativeFontInfo&)
+      SetNativeFontInfo__6wxFontFRC16wxNativeFontInfo
       ;wxFont::SetFaceName(const wxString&)
       SetFaceName__6wxFontFRC8wxString
-      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetWeight(wxFontWeight)
+      SetWeight__16wxNativeFontInfoF12wxFontWeight
       ;wxFont::sm_classwxFont
       sm_classwxFont__6wxFont
+      __vft6wxFont8wxObject
+      ;wxNativeFontInfo::SetPointSize(int)
+      SetPointSize__16wxNativeFontInfoFi
       ;wxFont::Init()
       Init__6wxFontFv
+      ;wxNativeFontInfo::ToString() const
+      ToString__16wxNativeFontInfoCFv
       ;wxFont::GetResourceHandle()
       GetResourceHandle__6wxFontFv
+      ;wxNativeFontInfo::GetEncoding() const
+      GetEncoding__16wxNativeFontInfoCFv
+      ;wxFontRefData::Free()
+      Free__13wxFontRefDataFv
+      ;wxFontRefData::Alloc(wxFont*)
+      Alloc__13wxFontRefDataFP6wxFont
       ;wxFont::SetPointSize(int)
       SetPointSize__6wxFontFi
       ;wxFont::SetWeight(int)
       SetWeight__6wxFontFi
       ;wxFont::SetFM(_FONTMETRICS*,int)
       SetFM__6wxFontFP12_FONTMETRICSi
+      ;wxNativeFontInfo::Init()
+      Init__16wxNativeFontInfoFv
       ;wxFont::~wxFont()
       __dt__6wxFontFv
       ;wxFont::Unshare()
@@ -12076,12 +12082,14 @@ EXPORTS
       RealizeResource__6wxFontFv
       ;wxFont::GetWeight() const
       GetWeight__6wxFontCFv
+      ;wxNativeFontInfo::GetWeight() const
+      GetWeight__16wxNativeFontInfoCFv
       ;wxFont::GetPointSize() const
       GetPointSize__6wxFontCFv
       ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
       Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
-      ;wxFont::wxFont(const wxNativeFontInfo&)
-      __ct__6wxFontFRC16wxNativeFontInfo
+      ;wxNativeFontInfo::SetFaceName(wxString)
+      SetFaceName__16wxNativeFontInfoF8wxString
   ;From object file:  ..\os2\fontdlg.cpp
     ;PUBDEFs (Symbols available from object file):
       ;wxConstructorForwxFontDialog()
@@ -12114,6 +12122,8 @@ EXPORTS
       SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding
   ;From object file:  ..\os2\fontutil.cpp
     ;PUBDEFs (Symbols available from object file):
+      ;wxGetFontEncFromCharSet(int)
+      wxGetFontEncFromCharSet__Fi
       ;wxNativeEncodingInfo::ToString() const
       ToString__20wxNativeEncodingInfoCFv
       ;wxTestFontEncoding(const wxNativeEncodingInfo&)
@@ -12122,8 +12132,10 @@ EXPORTS
       wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
       ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
       wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
-      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,const wxFont*)
-      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPC6wxFont
+      ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
+      wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
+      ;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long,long*,wxString&,wxFont*)
+      wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCUlPlR8wxStringP6wxFont
       ;wxGpiStrcmp(char*,char*)
       wxGpiStrcmp__FPcT1
       ;wxNativeEncodingInfo::FromString(const wxString&)
-- 
2.50.0

