From fe3fcb057f50ed3a8c4f6f86aba4e65561325e06 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sun, 20 Jan 2002 16:29:47 +0000 Subject: [PATCH] resource loader structure added git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/checklst.cpp | 1 + src/mac/carbon/cursor.cpp | 76 +++++++++++++++++++++++-------------- src/mac/carbon/listbox.cpp | 2 +- src/mac/checklst.cpp | 1 + src/mac/cursor.cpp | 76 +++++++++++++++++++++++-------------- src/mac/listbox.cpp | 2 +- 6 files changed, 98 insertions(+), 60 deletions(-) diff --git a/src/mac/carbon/checklst.cpp b/src/mac/carbon/checklst.cpp index 4f8bc5723b..95f2e86fa1 100644 --- a/src/mac/carbon/checklst.cpp +++ b/src/mac/carbon/checklst.cpp @@ -208,6 +208,7 @@ bool wxCheckListBox::Create(wxWindow *parent, long result ; + wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, kControlListBoxProc , (long) this ) ; diff --git a/src/mac/carbon/cursor.cpp b/src/mac/carbon/cursor.cpp index c65a32ecb1..374a67e9c0 100644 --- a/src/mac/carbon/cursor.cpp +++ b/src/mac/carbon/cursor.cpp @@ -76,7 +76,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho wxCursor::wxCursor(int cursor_type) { m_refData = new wxCursorRefData; - + + switch (cursor_type) { case wxCURSOR_WAIT: @@ -89,47 +90,64 @@ wxCursor::wxCursor(int cursor_type) M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor); break; case wxCURSOR_SIZENWSE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENESW: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZEWE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENS: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + } break; case wxCURSOR_CHAR: - { - M_CURSORDATA->m_hCursor = MacArrowCursor; - break; - } + { + M_CURSORDATA->m_hCursor = MacArrowCursor; + break; + } case wxCURSOR_HAND: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_BULLSEYE: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_PENCIL: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_MAGNIFIER: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_NO_ENTRY: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_LEFT_BUTTON: { M_CURSORDATA->m_hCursor = MacArrowCursor; diff --git a/src/mac/carbon/listbox.cpp b/src/mac/carbon/listbox.cpp index a5ef8163b0..58cf2550c7 100644 --- a/src/mac/carbon/listbox.cpp +++ b/src/mac/carbon/listbox.cpp @@ -195,7 +195,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, #else long result ; - + wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, kControlListBoxProc , (long) this ) ; diff --git a/src/mac/checklst.cpp b/src/mac/checklst.cpp index 4f8bc5723b..95f2e86fa1 100644 --- a/src/mac/checklst.cpp +++ b/src/mac/checklst.cpp @@ -208,6 +208,7 @@ bool wxCheckListBox::Create(wxWindow *parent, long result ; + wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, kControlListBoxProc , (long) this ) ; diff --git a/src/mac/cursor.cpp b/src/mac/cursor.cpp index c65a32ecb1..374a67e9c0 100644 --- a/src/mac/cursor.cpp +++ b/src/mac/cursor.cpp @@ -76,7 +76,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho wxCursor::wxCursor(int cursor_type) { m_refData = new wxCursorRefData; - + + switch (cursor_type) { case wxCURSOR_WAIT: @@ -89,47 +90,64 @@ wxCursor::wxCursor(int cursor_type) M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor); break; case wxCURSOR_SIZENWSE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENESW: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZEWE: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); + } break; case wxCURSOR_SIZENS: - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); + } break; case wxCURSOR_CHAR: - { - M_CURSORDATA->m_hCursor = MacArrowCursor; - break; - } + { + M_CURSORDATA->m_hCursor = MacArrowCursor; + break; + } case wxCURSOR_HAND: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_BULLSEYE: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_PENCIL: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_MAGNIFIER: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_NO_ENTRY: - { - M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); - break; - } + { + wxStAppResource resload ; + M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); + } + break; case wxCURSOR_LEFT_BUTTON: { M_CURSORDATA->m_hCursor = MacArrowCursor; diff --git a/src/mac/listbox.cpp b/src/mac/listbox.cpp index a5ef8163b0..58cf2550c7 100644 --- a/src/mac/listbox.cpp +++ b/src/mac/listbox.cpp @@ -195,7 +195,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id, #else long result ; - + wxStAppResource resload ; m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , kwxMacListWithVerticalScrollbar , 0 , 0, kControlListBoxProc , (long) this ) ; -- 2.45.2