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

resource loader structure added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-01-20 16:29:47 +00:00
parent 9b59f1a636
commit fe3fcb057f
6 changed files with 98 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mac/carbon/checklst.cpp
View File

@@ -208,6 +208,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
long result ; long result ;
wxStAppResource resload ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
kwxMacListWithVerticalScrollbar , 0 , 0, kwxMacListWithVerticalScrollbar , 0 , 0,
kControlListBoxProc , (long) this ) ; kControlListBoxProc , (long) this ) ;

76
src/mac/carbon/cursor.cpp
View File

@@ -76,7 +76,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
wxCursor::wxCursor(int cursor_type) wxCursor::wxCursor(int cursor_type)
{ {
m_refData = new wxCursorRefData; m_refData = new wxCursorRefData;
switch (cursor_type) switch (cursor_type)
{ {
case wxCURSOR_WAIT: case wxCURSOR_WAIT:
@@ -89,47 +90,64 @@ wxCursor::wxCursor(int cursor_type)
M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor); M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
break; break;
case wxCURSOR_SIZENWSE: case wxCURSOR_SIZENWSE:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZENESW: case wxCURSOR_SIZENESW:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZEWE: case wxCURSOR_SIZEWE:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZENS: case wxCURSOR_SIZENS:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
}
break; break;
case wxCURSOR_CHAR: case wxCURSOR_CHAR:
{ {
M_CURSORDATA->m_hCursor = MacArrowCursor; M_CURSORDATA->m_hCursor = MacArrowCursor;
break; break;
} }
case wxCURSOR_HAND: case wxCURSOR_HAND:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_BULLSEYE: case wxCURSOR_BULLSEYE:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_PENCIL: case wxCURSOR_PENCIL:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_MAGNIFIER: case wxCURSOR_MAGNIFIER:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_NO_ENTRY: case wxCURSOR_NO_ENTRY:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_LEFT_BUTTON: case wxCURSOR_LEFT_BUTTON:
{ {
M_CURSORDATA->m_hCursor = MacArrowCursor; M_CURSORDATA->m_hCursor = MacArrowCursor;

2
src/mac/carbon/listbox.cpp
View File

@@ -195,7 +195,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
#else #else
long result ; long result ;
wxStAppResource resload ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
kwxMacListWithVerticalScrollbar , 0 , 0, kwxMacListWithVerticalScrollbar , 0 , 0,
kControlListBoxProc , (long) this ) ; kControlListBoxProc , (long) this ) ;

1
src/mac/checklst.cpp
View File

@@ -208,6 +208,7 @@ bool wxCheckListBox::Create(wxWindow *parent,
long result ; long result ;
wxStAppResource resload ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
kwxMacListWithVerticalScrollbar , 0 , 0, kwxMacListWithVerticalScrollbar , 0 , 0,
kControlListBoxProc , (long) this ) ; kControlListBoxProc , (long) this ) ;

76
src/mac/cursor.cpp
View File

@@ -76,7 +76,8 @@ wxCursor::wxCursor(const wxString& cursor_file, long flags, int hotSpotX, int ho
wxCursor::wxCursor(int cursor_type) wxCursor::wxCursor(int cursor_type)
{ {
m_refData = new wxCursorRefData; m_refData = new wxCursorRefData;
switch (cursor_type) switch (cursor_type)
{ {
case wxCURSOR_WAIT: case wxCURSOR_WAIT:
@@ -89,47 +90,64 @@ wxCursor::wxCursor(int cursor_type)
M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor); M_CURSORDATA->m_hCursor = ::GetCursor(crossCursor);
break; break;
case wxCURSOR_SIZENWSE: case wxCURSOR_SIZENWSE:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZENESW: case wxCURSOR_SIZENESW:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZEWE: case wxCURSOR_SIZEWE:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeWEId);
}
break; break;
case wxCURSOR_SIZENS: case wxCURSOR_SIZENS:
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId); {
wxStAppResource resload ;
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorSizeNSId);
}
break; break;
case wxCURSOR_CHAR: case wxCURSOR_CHAR:
{ {
M_CURSORDATA->m_hCursor = MacArrowCursor; M_CURSORDATA->m_hCursor = MacArrowCursor;
break; break;
} }
case wxCURSOR_HAND: case wxCURSOR_HAND:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_BULLSEYE: case wxCURSOR_BULLSEYE:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_PENCIL: case wxCURSOR_PENCIL:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_MAGNIFIER: case wxCURSOR_MAGNIFIER:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_NO_ENTRY: case wxCURSOR_NO_ENTRY:
{ {
M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId); wxStAppResource resload ;
break; M_CURSORDATA->m_hCursor = ::GetCursor(kwxCursorHandId);
} }
break;
case wxCURSOR_LEFT_BUTTON: case wxCURSOR_LEFT_BUTTON:
{ {
M_CURSORDATA->m_hCursor = MacArrowCursor; M_CURSORDATA->m_hCursor = MacArrowCursor;

2
src/mac/listbox.cpp
View File

@@ -195,7 +195,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
#else #else
long result ; long result ;
wxStAppResource resload ;
m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , m_macControl = ::NewControl( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false ,
kwxMacListWithVerticalScrollbar , 0 , 0, kwxMacListWithVerticalScrollbar , 0 , 0,
kControlListBoxProc , (long) this ) ; kControlListBoxProc , (long) this ) ;