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

Consildation and cleanup of global variables. Mostly all delclared and all defined in one header and module.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2002-01-09 23:22:53 +00:00
parent 0eb529d9e4
commit d0a6b27997
9 changed files with 131 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/os2/app.cpp
View File

@@ -96,16 +96,6 @@ HAB vHabmain = NULLHANDLE;
QMSG svCurrentMsg; QMSG svCurrentMsg;
wxApp* wxTheApp = NULL; 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_FRAME_ICON = (HICON) NULL;
HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL; HICON wxSTD_MDICHILDFRAME_ICON = (HICON) NULL;

88
src/os2/data.cpp
View File

@@ -98,43 +98,59 @@ wxFont wxNullFont;
wxColour wxNullColour; wxColour wxNullColour;
wxNativeFontInfo wxNullNativeFontInfo; wxNativeFontInfo wxNullNativeFontInfo;
//
// Default window names // Default window names
const wxChar *wxButtonNameStr = wxT("button"); //
const wxChar *wxCanvasNameStr = wxT("canvas"); const wxChar* wxButtonNameStr = wxT("button");
const wxChar *wxCheckBoxNameStr = wxT("check"); const wxChar* wxCanvasNameStr = wxT("canvas");
const wxChar *wxChoiceNameStr = wxT("choice"); const wxChar* wxCheckBoxNameStr = wxT("check");
const wxChar *wxComboBoxNameStr = wxT("comboBox"); const wxChar* wxChoiceNameStr = wxT("choice");
const wxChar *wxDialogNameStr = wxT("dialog"); const wxChar* wxComboBoxNameStr = wxT("comboBox");
const wxChar *wxFrameNameStr = wxT("frame"); const wxChar* wxDialogNameStr = wxT("dialog");
const wxChar *wxGaugeNameStr = wxT("gauge"); const wxChar* wxFrameNameStr = wxT("frame");
const wxChar *wxStaticBoxNameStr = wxT("groupBox"); const wxChar* wxGaugeNameStr = wxT("gauge");
const wxChar *wxListBoxNameStr = wxT("listBox"); const wxChar* wxStaticBoxNameStr = wxT("groupBox");
const wxChar *wxStaticTextNameStr = wxT("message"); const wxChar* wxListBoxNameStr = wxT("listBox");
const wxChar *wxStaticBitmapNameStr = wxT("message"); const wxChar* wxStaticTextNameStr = wxT("message");
const wxChar *wxMultiTextNameStr = wxT("multitext"); const wxChar* wxStaticBitmapNameStr = wxT("message");
const wxChar *wxPanelNameStr = wxT("panel"); const wxChar* wxMultiTextNameStr = wxT("multitext");
const wxChar *wxRadioBoxNameStr = wxT("radioBox"); const wxChar* wxPanelNameStr = wxT("panel");
const wxChar *wxRadioButtonNameStr = wxT("radioButton"); const wxChar* wxRadioBoxNameStr = wxT("radioBox");
const wxChar *wxBitmapRadioButtonNameStr = wxT("radioButton"); const wxChar* wxRadioButtonNameStr = wxT("radioButton");
const wxChar *wxScrollBarNameStr = wxT("scrollBar"); const wxChar* wxBitmapRadioButtonNameStr = wxT("radioButton");
const wxChar *wxSliderNameStr = wxT("slider"); const wxChar* wxScrollBarNameStr = wxT("scrollBar");
const wxChar *wxStaticNameStr = wxT("static"); const wxChar* wxSliderNameStr = wxT("slider");
const wxChar *wxTextCtrlWindowNameStr = wxT("textWindow"); const wxChar* wxStaticNameStr = wxT("static");
const wxChar *wxTextCtrlNameStr = wxT("text"); const wxChar* wxTextCtrlWindowNameStr = wxT("textWindow");
const wxChar *wxVirtListBoxNameStr = wxT("virtListBox"); const wxChar* wxTextCtrlNameStr = wxT("text");
const wxChar *wxButtonBarNameStr = wxT("buttonbar"); const wxChar* wxVirtListBoxNameStr = wxT("virtListBox");
const wxChar *wxEnhDialogNameStr = wxT("Shell"); const wxChar* wxButtonBarNameStr = wxT("buttonbar");
const wxChar *wxToolBarNameStr = wxT("toolbar"); const wxChar* wxEnhDialogNameStr = wxT("Shell");
const wxChar *wxStatusLineNameStr = wxT("status_line"); const wxChar* wxToolBarNameStr = wxT("toolbar");
const wxChar *wxGetTextFromUserPromptStr = wxT("Input Text"); const wxChar* wxStatusLineNameStr = wxT("status_line");
const wxChar *wxMessageBoxCaptionStr = wxT("Message"); const wxChar* wxGetTextFromUserPromptStr = wxT("Input Text");
const wxChar *wxFileSelectorPromptStr = wxT("Select a file"); const wxChar* wxMessageBoxCaptionStr = wxT("Message");
const wxChar *wxFileSelectorDefaultWildcardStr = wxT("*.*"); const wxChar* wxFileSelectorPromptStr = wxT("Select a file");
const wxChar *wxInternalErrorStr = wxT("wxWindows Internal Error"); const wxChar* wxFileSelectorDefaultWildcardStr = wxT("*.*");
const wxChar *wxFatalErrorStr = wxT("wxWindows Fatal Error"); const wxChar* wxInternalErrorStr = wxT("wxWindows Internal Error");
const wxChar *wxTreeCtrlNameStr = wxT("treeCtrl"); const wxChar* wxFatalErrorStr = wxT("wxWindows Fatal Error");
const wxChar *wxDirDialogNameStr = wxT("wxDirCtrl"); const wxChar* wxTreeCtrlNameStr = wxT("treeCtrl");
const wxChar *wxDirDialogDefaultFolderStr = wxT("/"); 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 // See wx/utils.h
const wxChar *wxFloatToStringStr = wxT("%.2f"); const wxChar *wxFloatToStringStr = wxT("%.2f");

11
src/os2/font.cpp
View File

@@ -1085,3 +1085,14 @@ void wxFont::SetFM(
} // end of wxFont::SetFM } // end of wxFont::SetFM
void wxFont::SetPS(
HPS hPS
)
{
Unshare();
M_FONTDATA->SetPS(hPS);
RealizeResource();
} // end of wxFont::SetUnderlined

1
src/os2/frame.cpp
View File

@@ -52,7 +52,6 @@
extern wxWindowList wxModelessWindows; extern wxWindowList wxModelessWindows;
extern wxList WXDLLEXPORT wxPendingDelete; extern wxList WXDLLEXPORT wxPendingDelete;
extern const wxChar* wxFrameClassName;
#if wxUSE_MENUS_NATIVE #if wxUSE_MENUS_NATIVE
extern wxMenu *wxCurrentPopupMenu; extern wxMenu *wxCurrentPopupMenu;

2
src/os2/mdi.cpp
View File

@@ -37,8 +37,6 @@
extern wxWindowList wxModelessWindows; // from dialog.cpp extern wxWindowList wxModelessWindows; // from dialog.cpp
extern wxMenu *wxCurrentPopupMenu; extern wxMenu *wxCurrentPopupMenu;
extern wxChar wxMDIFrameClassName[];
extern wxChar wxMDIChildFrameClassName[];
extern wxWindow *wxWndHook; // from window.cpp extern wxWindow *wxWndHook; // from window.cpp
extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win); extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);

2
src/os2/toplevel.cpp
View File

@@ -52,8 +52,6 @@
wxWindowList wxModelessWindows; wxWindowList wxModelessWindows;
// the name of the default wxWindows class // the name of the default wxWindows class
extern const wxChar* wxCanvasClassName;
extern const wxChar* wxFrameClassName;
extern void wxAssociateWinWithHandle( HWND hWnd extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin ,wxWindowOS2* pWin
); );

2
src/os2/utilsexc.cpp
View File

@@ -130,8 +130,6 @@ MRESULT APIENTRY wxExecuteWindowCbk(
return 0; return 0;
} }
extern wxChar wxPanelClassName[];
long wxExecute( long wxExecute(
const wxString& rCommand const wxString& rCommand
, bool bSync , bool bSync

3
src/os2/window.cpp
View File

@@ -102,9 +102,6 @@ QMSG s_currentMsg;
wxMenu* wxCurrentPopupMenu = NULL; wxMenu* wxCurrentPopupMenu = NULL;
#endif // wxUSE_MENUS_NATIVE #endif // wxUSE_MENUS_NATIVE
#if !defined(__VISAGECPP__) || (__IBMCPP__ < 400)
extern wxChar wxCanvasClassName[];
#endif
wxList* wxWinHandleList = NULL; wxList* wxWinHandleList = NULL;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------

124
src/os2/wx23.def
View File

@@ -2193,22 +2193,14 @@ EXPORTS
OpenFile__12wxFileSystemFRC8wxString OpenFile__12wxFileSystemFRC8wxString
;From object file: ..\common\fontcmn.cpp ;From object file: ..\common\fontcmn.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxNativeFontInfo::SetUnderlined(unsigned long)
SetUnderlined__16wxNativeFontInfoFUl
;wxFontBase::GetNativeFontInfo() const ;wxFontBase::GetNativeFontInfo() const
GetNativeFontInfo__10wxFontBaseCFv GetNativeFontInfo__10wxFontBaseCFv
;wxNativeFontInfo::GetUnderlined() const
GetUnderlined__16wxNativeFontInfoCFv
;wxFontBase::New(const wxNativeFontInfo&) ;wxFontBase::New(const wxNativeFontInfo&)
New__10wxFontBaseFRC16wxNativeFontInfo New__10wxFontBaseFRC16wxNativeFontInfo
;wxFontBase::New(const wxString&) ;wxFontBase::New(const wxString&)
New__10wxFontBaseFRC8wxString New__10wxFontBaseFRC8wxString
;wxNativeFontInfo::FromString(const wxString&)
FromString__16wxNativeFontInfoFRC8wxString
;wxFont::operator=(const wxFont&) ;wxFont::operator=(const wxFont&)
__as__6wxFontFRC6wxFont __as__6wxFontFRC6wxFont
;wxNativeFontInfo::SetFamily(wxFontFamily)
SetFamily__16wxNativeFontInfoF12wxFontFamily
;wxFontBase::GetNativeFontInfoDesc() const ;wxFontBase::GetNativeFontInfoDesc() const
GetNativeFontInfoDesc__10wxFontBaseCFv GetNativeFontInfoDesc__10wxFontBaseCFv
;wxNativeFontInfo::ToUserString() const ;wxNativeFontInfo::ToUserString() const
@@ -2223,45 +2215,19 @@ EXPORTS
SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo SetNativeFontInfo__10wxFontBaseFRC16wxNativeFontInfo
;wxFontBase::SetNativeFontInfoUserDesc(const wxString&) ;wxFontBase::SetNativeFontInfoUserDesc(const wxString&)
SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString SetNativeFontInfoUserDesc__10wxFontBaseFRC8wxString
;wxNativeFontInfo::SetStyle(wxFontStyle)
SetStyle__16wxNativeFontInfoF11wxFontStyle
;wxFontBase::ms_encodingDefault ;wxFontBase::ms_encodingDefault
ms_encodingDefault__10wxFontBase 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&) ;wxFontBase::SetNativeFontInfo(const wxString&)
SetNativeFontInfo__10wxFontBaseFRC8wxString SetNativeFontInfo__10wxFontBaseFRC8wxString
;wxNativeFontInfo::SetWeight(wxFontWeight) ;wxFontBase::operator==(const wxFont&) const
SetWeight__16wxNativeFontInfoF12wxFontWeight __eq__10wxFontBaseCFRC6wxFont
__vft10wxFontBase8wxObject __vft10wxFontBase8wxObject
;wxFontBase::operator!=(const wxFont&) const ;wxFontBase::operator!=(const wxFont&) const
__ne__10wxFontBaseCFRC6wxFont __ne__10wxFontBaseCFRC6wxFont
;wxFontBase::operator==(const wxFont&) const
__eq__10wxFontBaseCFRC6wxFont
;wxNativeFontInfo::SetPointSize(int)
SetPointSize__16wxNativeFontInfoFi
;wxNativeFontInfo::ToString() const
ToString__16wxNativeFontInfoCFv
;wxFontBase::GetFamilyString() const ;wxFontBase::GetFamilyString() const
GetFamilyString__10wxFontBaseCFv 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) ;wxFontBase::New(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding New__10wxFontBaseFiN31UlRC8wxString14wxFontEncoding
;wxNativeFontInfo::SetFaceName(wxString)
SetFaceName__16wxNativeFontInfoF8wxString
;wxNativeFontInfo::FromUserString(const wxString&) ;wxNativeFontInfo::FromUserString(const wxString&)
FromUserString__16wxNativeFontInfoFRC8wxString FromUserString__16wxNativeFontInfoFRC8wxString
;From object file: ..\common\fontmap.cpp ;From object file: ..\common\fontmap.cpp
@@ -10918,8 +10884,6 @@ EXPORTS
OnIdle__5wxAppFR11wxIdleEvent OnIdle__5wxAppFR11wxIdleEvent
;wxMsgArray::wxMsgArray(const wxMsgArray&) ;wxMsgArray::wxMsgArray(const wxMsgArray&)
__ct__10wxMsgArrayFRC10wxMsgArray __ct__10wxMsgArrayFRC10wxMsgArray
wxPanelClassName
wxMDIFrameClassName
;wxMsgArray::Insert(const _QMSG&,unsigned int) ;wxMsgArray::Insert(const _QMSG&,unsigned int)
Insert__10wxMsgArrayFRC5_QMSGUi Insert__10wxMsgArrayFRC5_QMSGUi
;wxApp::HandleSockets() ;wxApp::HandleSockets()
@@ -10956,14 +10920,11 @@ EXPORTS
Initialized__5wxAppFv Initialized__5wxAppFv
;wxApp::GetEventTable() const ;wxApp::GetEventTable() const
GetEventTable__5wxAppCFv GetEventTable__5wxAppCFv
wxFrameClassNameNoRedraw
;wxSetInstance(unsigned long) ;wxSetInstance(unsigned long)
wxSetInstance__FUl wxSetInstance__FUl
;wxMsgArray::RemoveAt(unsigned int) ;wxMsgArray::RemoveAt(unsigned int)
RemoveAt__10wxMsgArrayFUi RemoveAt__10wxMsgArrayFUi
wxMDIChildFrameClassName
wxGetInstance wxGetInstance
wxFrameClassName
;wxApp::GetStdIcon(int) const ;wxApp::GetStdIcon(int) const
GetStdIcon__5wxAppCFi GetStdIcon__5wxAppCFi
;wxMsgArray::~wxMsgArray() ;wxMsgArray::~wxMsgArray()
@@ -10975,7 +10936,6 @@ EXPORTS
;wxApp::CleanUp() ;wxApp::CleanUp()
CleanUp__5wxAppFv CleanUp__5wxAppFv
svCurrentMsg svCurrentMsg
wxMDIChildFrameClassNameNoRedraw
;wxMsgArray::Index(const _QMSG&,unsigned long) const ;wxMsgArray::Index(const _QMSG&,unsigned long) const
Index__10wxMsgArrayCFRC5_QMSGUl Index__10wxMsgArrayCFRC5_QMSGUl
wxDisableButtonBrush wxDisableButtonBrush
@@ -10985,7 +10945,6 @@ EXPORTS
Initialize__5wxAppFUl Initialize__5wxAppFUl
;wxAppBase::m_appInitFn ;wxAppBase::m_appInitFn
m_appInitFn__9wxAppBase m_appInitFn__9wxAppBase
wxCanvasClassName
;wxApp::DoMessage() ;wxApp::DoMessage()
DoMessage__5wxAppFv DoMessage__5wxAppFv
;wxExit() ;wxExit()
@@ -10996,7 +10955,6 @@ EXPORTS
Dispatch__5wxAppFv Dispatch__5wxAppFv
;wxEntry(int,char**) ;wxEntry(int,char**)
wxEntry__FiPPc wxEntry__FiPPc
wxMDIFrameClassNameNoRedraw
;wxApp::SendIdleEvents(wxWindow*) ;wxApp::SendIdleEvents(wxWindow*)
SendIdleEvents__5wxAppFP8wxWindow SendIdleEvents__5wxAppFP8wxWindow
;From object file: ..\os2\bitmap.cpp ;From object file: ..\os2\bitmap.cpp
@@ -11497,12 +11455,15 @@ EXPORTS
wxDialogNameStr wxDialogNameStr
wxCheckBoxNameStr wxCheckBoxNameStr
wxCanvasNameStr wxCanvasNameStr
wxCanvasClassNameNR
wxCYAN_PEN wxCYAN_PEN
wxButtonBarNameStr wxButtonBarNameStr
wxNullBitmap wxNullBitmap
wxNORMAL_FONT wxNORMAL_FONT
wxMEDIUM_GREY_BRUSH wxMEDIUM_GREY_BRUSH
wxTheColourDatabase wxTheColourDatabase
wxPanelClassName
wxMDIFrameClassName
wxLIGHT_GREY wxLIGHT_GREY
wxDefaultSize wxDefaultSize
wxBLUE wxBLUE
@@ -11512,6 +11473,7 @@ EXPORTS
wxStaticBoxNameStr wxStaticBoxNameStr
wxSliderNameStr wxSliderNameStr
wxRED_PEN wxRED_PEN
wxPanelClassNameNR
wxMultiTextNameStr wxMultiTextNameStr
wxMEDIUM_GREY_PEN wxMEDIUM_GREY_PEN
wxGaugeNameStr wxGaugeNameStr
@@ -11536,9 +11498,12 @@ EXPORTS
wxComboBoxNameStr wxComboBoxNameStr
wxCROSS_CURSOR wxCROSS_CURSOR
wxTopLevelWindows wxTopLevelWindows
wxFrameClassNameNoRedraw
wxTRANSPARENT_BRUSH wxTRANSPARENT_BRUSH
wxWHITE_BRUSH wxWHITE_BRUSH
wxRED_BRUSH wxRED_BRUSH
wxFrameClassName
wxMDIChildFrameClassName
wxNullColour wxNullColour
wxTRANSPARENT_PEN wxTRANSPARENT_PEN
wxStaticNameStr wxStaticNameStr
@@ -11552,11 +11517,13 @@ EXPORTS
wxBLACK_DASHED_PEN wxBLACK_DASHED_PEN
g_globalCursor g_globalCursor
wxNullNativeFontInfo wxNullNativeFontInfo
wxMDIChildFrameClassNameNoRedraw
wxBLUE_BRUSH wxBLUE_BRUSH
wxLIGHT_GREY_BRUSH wxLIGHT_GREY_BRUSH
wxBLACK_BRUSH wxBLACK_BRUSH
wxPendingDelete wxPendingDelete
wxNullAcceleratorTable wxNullAcceleratorTable
wxCanvasClassName
wxGREEN_PEN wxGREEN_PEN
wxVirtListBoxNameStr wxVirtListBoxNameStr
wxStatusLineNameStr wxStatusLineNameStr
@@ -11571,6 +11538,7 @@ EXPORTS
wxChoiceNameStr wxChoiceNameStr
wxCYAN wxCYAN
wxBLACK wxBLACK
wxMDIFrameClassNameNoRedraw
;From object file: ..\os2\dataobj.cpp ;From object file: ..\os2\dataobj.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxDataFormat::wxDataFormat() ;wxDataFormat::wxDataFormat()
@@ -12014,12 +11982,18 @@ EXPORTS
sm_classwxFileDialog__12wxFileDialog sm_classwxFileDialog__12wxFileDialog
;From object file: ..\os2\font.cpp ;From object file: ..\os2\font.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxFont::Create(const wxNativeFontInfo&,unsigned long)
Create__6wxFontFRC16wxNativeFontInfoUl
;wxNativeFontInfo::SetUnderlined(unsigned long)
SetUnderlined__16wxNativeFontInfoFUl
;wxFont::SetStyle(int) ;wxFont::SetStyle(int)
SetStyle__6wxFontFi SetStyle__6wxFontFi
;wxFont::OS2SelectMatchingFontByName() ;wxFontRefData::Init(const wxNativeFontInfo&,unsigned long,unsigned long)
OS2SelectMatchingFontByName__6wxFontFv Init__13wxFontRefDataFRC16wxNativeFontInfoUlT2
;wxFont::IsFree() const ;wxFont::IsFree() const
IsFree__6wxFontCFv IsFree__6wxFontCFv
;wxNativeFontInfo::GetUnderlined() const
GetUnderlined__16wxNativeFontInfoCFv
;wxFont::GetHFONT() const ;wxFont::GetHFONT() const
GetHFONT__6wxFontCFv GetHFONT__6wxFontCFv
;wxFont::GetFamily() const ;wxFont::GetFamily() const
@@ -12028,9 +12002,15 @@ EXPORTS
GetFaceName__6wxFontCFv GetFaceName__6wxFontCFv
;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding) ;wxFontRefData::Init(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding Init__13wxFontRefDataFiN31UlRC8wxString14wxFontEncoding
;wxFont::wxFont(const wxString&)
__ct__6wxFontFRC8wxString
;wxNativeFontInfo::FromString(const wxString&)
FromString__16wxNativeFontInfoFRC8wxString
;wxNativeFontInfo::SetFamily(wxFontFamily)
SetFamily__16wxNativeFontInfoF12wxFontFamily
__vft13wxFontRefData15wxObjectRefData
;wxFont::SetFamily(int) ;wxFont::SetFamily(int)
SetFamily__6wxFontFi SetFamily__6wxFontFi
__vft13wxFontRefData15wxObjectRefData
;wxConstructorForwxFont() ;wxConstructorForwxFont()
wxConstructorForwxFont__Fv wxConstructorForwxFont__Fv
;wxFontRefData::~wxFontRefData() ;wxFontRefData::~wxFontRefData()
@@ -12039,6 +12019,8 @@ EXPORTS
GetUnderlined__6wxFontCFv GetUnderlined__6wxFontCFv
;wxFont::GetStyle() const ;wxFont::GetStyle() const
GetStyle__6wxFontCFv GetStyle__6wxFontCFv
;wxFont::GetNativeFontInfo() const
GetNativeFontInfo__6wxFontCFv
;wxFont::SetEncoding(wxFontEncoding) ;wxFont::SetEncoding(wxFontEncoding)
SetEncoding__6wxFontF14wxFontEncoding SetEncoding__6wxFontF14wxFontEncoding
;wxFont::FreeResource(unsigned long) ;wxFont::FreeResource(unsigned long)
@@ -12047,27 +12029,51 @@ EXPORTS
SetUnderlined__6wxFontFUl SetUnderlined__6wxFontFUl
;wxFont::SetPS(unsigned long) ;wxFont::SetPS(unsigned long)
SetPS__6wxFontFUl SetPS__6wxFontFUl
;wxFont::GetFontId() const ;wxNativeFontInfo::SetStyle(wxFontStyle)
GetFontId__6wxFontCFv SetStyle__16wxNativeFontInfoF11wxFontStyle
;wxFont::GetPS() const ;wxNativeFontInfo::GetPointSize() const
GetPS__6wxFontCFv GetPointSize__16wxNativeFontInfoCFv
;wxNativeFontInfo::GetStyle() const
GetStyle__16wxNativeFontInfoCFv
;wxNativeFontInfo::GetFamily() const
GetFamily__16wxNativeFontInfoCFv
;wxNativeFontInfo::GetFaceName() const
GetFaceName__16wxNativeFontInfoCFv
;wxFont::GetEncoding() const ;wxFont::GetEncoding() const
GetEncoding__6wxFontCFv GetEncoding__6wxFontCFv
;wxNativeFontInfo::SetEncoding(wxFontEncoding)
SetEncoding__16wxNativeFontInfoF14wxFontEncoding
;wxFont::SetNativeFontInfo(const wxNativeFontInfo&)
SetNativeFontInfo__6wxFontFRC16wxNativeFontInfo
;wxFont::SetFaceName(const wxString&) ;wxFont::SetFaceName(const wxString&)
SetFaceName__6wxFontFRC8wxString SetFaceName__6wxFontFRC8wxString
__vft6wxFont8wxObject ;wxNativeFontInfo::SetWeight(wxFontWeight)
SetWeight__16wxNativeFontInfoF12wxFontWeight
;wxFont::sm_classwxFont ;wxFont::sm_classwxFont
sm_classwxFont__6wxFont sm_classwxFont__6wxFont
__vft6wxFont8wxObject
;wxNativeFontInfo::SetPointSize(int)
SetPointSize__16wxNativeFontInfoFi
;wxFont::Init() ;wxFont::Init()
Init__6wxFontFv Init__6wxFontFv
;wxNativeFontInfo::ToString() const
ToString__16wxNativeFontInfoCFv
;wxFont::GetResourceHandle() ;wxFont::GetResourceHandle()
GetResourceHandle__6wxFontFv GetResourceHandle__6wxFontFv
;wxNativeFontInfo::GetEncoding() const
GetEncoding__16wxNativeFontInfoCFv
;wxFontRefData::Free()
Free__13wxFontRefDataFv
;wxFontRefData::Alloc(wxFont*)
Alloc__13wxFontRefDataFP6wxFont
;wxFont::SetPointSize(int) ;wxFont::SetPointSize(int)
SetPointSize__6wxFontFi SetPointSize__6wxFontFi
;wxFont::SetWeight(int) ;wxFont::SetWeight(int)
SetWeight__6wxFontFi SetWeight__6wxFontFi
;wxFont::SetFM(_FONTMETRICS*,int) ;wxFont::SetFM(_FONTMETRICS*,int)
SetFM__6wxFontFP12_FONTMETRICSi SetFM__6wxFontFP12_FONTMETRICSi
;wxNativeFontInfo::Init()
Init__16wxNativeFontInfoFv
;wxFont::~wxFont() ;wxFont::~wxFont()
__dt__6wxFontFv __dt__6wxFontFv
;wxFont::Unshare() ;wxFont::Unshare()
@@ -12076,12 +12082,14 @@ EXPORTS
RealizeResource__6wxFontFv RealizeResource__6wxFontFv
;wxFont::GetWeight() const ;wxFont::GetWeight() const
GetWeight__6wxFontCFv GetWeight__6wxFontCFv
;wxNativeFontInfo::GetWeight() const
GetWeight__16wxNativeFontInfoCFv
;wxFont::GetPointSize() const ;wxFont::GetPointSize() const
GetPointSize__6wxFontCFv GetPointSize__6wxFontCFv
;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding) ;wxFont::Create(int,int,int,int,unsigned long,const wxString&,wxFontEncoding)
Create__6wxFontFiN31UlRC8wxString14wxFontEncoding Create__6wxFontFiN31UlRC8wxString14wxFontEncoding
;wxFont::wxFont(const wxNativeFontInfo&) ;wxNativeFontInfo::SetFaceName(wxString)
__ct__6wxFontFRC16wxNativeFontInfo SetFaceName__16wxNativeFontInfoF8wxString
;From object file: ..\os2\fontdlg.cpp ;From object file: ..\os2\fontdlg.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxConstructorForwxFontDialog() ;wxConstructorForwxFontDialog()
@@ -12114,6 +12122,8 @@ EXPORTS
SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding SetEncoding__22wxFontEnumeratorHelperF14wxFontEncoding
;From object file: ..\os2\fontutil.cpp ;From object file: ..\os2\fontutil.cpp
;PUBDEFs (Symbols available from object file): ;PUBDEFs (Symbols available from object file):
;wxGetFontEncFromCharSet(int)
wxGetFontEncFromCharSet__Fi
;wxNativeEncodingInfo::ToString() const ;wxNativeEncodingInfo::ToString() const
ToString__20wxNativeEncodingInfoCFv ToString__20wxNativeEncodingInfoCFv
;wxTestFontEncoding(const wxNativeEncodingInfo&) ;wxTestFontEncoding(const wxNativeEncodingInfo&)
@@ -12122,8 +12132,10 @@ EXPORTS
wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC wxCreateFontFromLogFont__FPC7_FATTRSCP12_FONTMETRICSP13_FACENAMEDESC
;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*) ;wxGetNativeFontEncoding(wxFontEncoding,wxNativeEncodingInfo*)
wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo wxGetNativeFontEncoding__F14wxFontEncodingP20wxNativeEncodingInfo
;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,const wxFont*) ;wxOS2SelectMatchingFontByName(_FATTRS*,_FACENAMEDESC*,_FONTMETRICS*,int,const wxFont*)
wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCPC6wxFont wxOS2SelectMatchingFontByName__FP7_FATTRSP13_FACENAMEDESCP12_FONTMETRICSiPC6wxFont
;wxFillLogFont(_FATTRS*,_FACENAMEDESC*,unsigned long,long*,wxString&,wxFont*)
wxFillLogFont__FP7_FATTRSP13_FACENAMEDESCUlPlR8wxStringP6wxFont
;wxGpiStrcmp(char*,char*) ;wxGpiStrcmp(char*,char*)
wxGpiStrcmp__FPcT1 wxGpiStrcmp__FPcT1
;wxNativeEncodingInfo::FromString(const wxString&) ;wxNativeEncodingInfo::FromString(const wxString&)