projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some compilers don't like statics in inline functions, even if they're const -- repla...
[wxWidgets.git]
/
src
/
os2
/
app.cpp
diff --git
a/src/os2/app.cpp
b/src/os2/app.cpp
index 52aebcb4b8958e34fb1e971f5cb6481c30188a24..7ea40472f2829f518e609c873923d369dbaa8f68 100644
(file)
--- a/
src/os2/app.cpp
+++ b/
src/os2/app.cpp
@@
-56,7
+56,11
@@
#endif //
#endif //
-#ifndef __EMX__
+#if defined(__WATCOMC__)
+
+#include <tcpustd.h>
+
+#elif !defined(__EMX__)
#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
extern "C" int _System bsdselect(int,
#define select(a,b,c,d,e) bsdselect(a,b,c,d,e)
extern "C" int _System bsdselect(int,
@@
-82,7
+86,6
@@
extern "C" int _System bsdselect(int,
// ---------------------------------------------------------------------------
extern wxChar* wxBuffer;
// ---------------------------------------------------------------------------
extern wxChar* wxBuffer;
-extern wxList* wxWinHandleList;
extern wxList WXDLLEXPORT wxPendingDelete;
extern wxCursor* g_globalCursor;
extern wxList WXDLLEXPORT wxPendingDelete;
extern wxCursor* g_globalCursor;
@@
-240,7
+243,7
@@
bool wxApp::Initialize(int& argc, wxChar **argv)
// wxRedirectIOToConsole();
#endif
// wxRedirectIOToConsole();
#endif
- wxWinHandle
List = new wxList(wxKEY_INTEGER
);
+ wxWinHandle
Hash = new wxWinHashTable(wxKEY_INTEGER, 100
);
// This is to foil optimizations in Visual C++ that throw out dummy.obj.
// PLEASE DO NOT ALTER THIS.
// This is to foil optimizations in Visual C++ that throw out dummy.obj.
// PLEASE DO NOT ALTER THIS.
@@
-269,7
+272,7
@@
bool wxApp::RegisterWindowClasses(
wxString sError;
if (!::WinRegisterClass( vHab
wxString sError;
if (!::WinRegisterClass( vHab
- ,wxFrameClassName
+ ,
(PSZ)
wxFrameClassName
,wxFrameWndProc
,CS_SIZEREDRAW | CS_SYNCPAINT
,sizeof(ULONG)
,wxFrameWndProc
,CS_SIZEREDRAW | CS_SYNCPAINT
,sizeof(ULONG)
@@
-282,7
+285,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxFrameClassNameNoRedraw
+ ,
(PSZ)
wxFrameClassNameNoRedraw
,wxWndProc
,0
,sizeof(ULONG)
,wxWndProc
,0
,sizeof(ULONG)
@@
-295,7
+298,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxMDIFrameClassName
+ ,
(PSZ)
wxMDIFrameClassName
,wxWndProc
,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
,sizeof(ULONG)
,wxWndProc
,CS_SIZEREDRAW | CS_MOVENOTIFY | CS_SYNCPAINT
,sizeof(ULONG)
@@
-308,7
+311,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxMDIFrameClassNameNoRedraw
+ ,
(PSZ)
wxMDIFrameClassNameNoRedraw
,wxWndProc
,0
,sizeof(ULONG)
,wxWndProc
,0
,sizeof(ULONG)
@@
-321,7
+324,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxMDIChildFrameClassName
+ ,
(PSZ)
wxMDIChildFrameClassName
,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
,sizeof(ULONG)
,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_SYNCPAINT | CS_HITTEST
,sizeof(ULONG)
@@
-334,7
+337,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxMDIChildFrameClassNameNoRedraw
+ ,
(PSZ)
wxMDIChildFrameClassNameNoRedraw
,wxWndProc
,CS_HITTEST
,sizeof(ULONG)
,wxWndProc
,CS_HITTEST
,sizeof(ULONG)
@@
-347,7
+350,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxPanelClassName
+ ,
(PSZ)
wxPanelClassName
,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
,sizeof(ULONG)
,wxWndProc
,CS_MOVENOTIFY | CS_SIZEREDRAW | CS_HITTEST | CS_SAVEBITS | CS_SYNCPAINT
,sizeof(ULONG)
@@
-360,7
+363,7
@@
bool wxApp::RegisterWindowClasses(
}
if (!::WinRegisterClass( vHab
}
if (!::WinRegisterClass( vHab
- ,wxCanvasClassName
+ ,
(PSZ)
wxCanvasClassName
,wxWndProc
,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
,sizeof(ULONG)
,wxWndProc
,CS_SIZEREDRAW | CS_HITTEST | CS_SYNCPAINT
,sizeof(ULONG)
@@
-372,7
+375,7
@@
bool wxApp::RegisterWindowClasses(
return FALSE;
}
if (!::WinRegisterClass( vHab
return FALSE;
}
if (!::WinRegisterClass( vHab
- ,wxCanvasClassNameNR
+ ,
(PSZ)
wxCanvasClassNameNR
,wxWndProc
,CS_HITTEST | CS_SYNCPAINT
,sizeof(ULONG)
,wxWndProc
,CS_HITTEST | CS_SYNCPAINT
,sizeof(ULONG)
@@
-419,8
+422,8
@@
void wxApp::CleanUp()
// TODO: ::DeleteObject( wxDisableButtonBrush );
}
// TODO: ::DeleteObject( wxDisableButtonBrush );
}
- if (wxWinHandleList)
-
delete wxWinHandleList
;
+ delete wxWinHandleHash;
+
wxWinHandleHash = NULL
;
// Delete Message queue
if (wxTheApp->m_hMq)
// Delete Message queue
if (wxTheApp->m_hMq)
@@
-489,8
+492,8
@@
void wxApp::OnIdle(
if (gbInOnIdle)
return;
if (gbInOnIdle)
return;
- gbInOnIdle =
TRUE
;
-
+ gbInOnIdle =
true
;
+
wxAppBase::OnIdle(rEvent);
#if wxUSE_DC_CACHEING
wxAppBase::OnIdle(rEvent);
#if wxUSE_DC_CACHEING
@@
-652,7
+655,7
@@
void wxApp::WakeUpIdle()
//
// Should never happen
//
//
// Should never happen
//
- wxLogLastError(
"PostMessage(WM_NULL)"
);
+ wxLogLastError(
wxT("PostMessage(WM_NULL)")
);
}
}
} // end of wxWakeUpIdle
}
}
} // end of wxWakeUpIdle
@@
-662,10
+665,7
@@
HAB wxGetInstance()
return vHabmain;
}
return vHabmain;
}
-void wxSetInstance(
- HAB vHab
-)
+void wxSetInstance( HAB vHab )
{
vHabmain = vHab;
}
{
vHabmain = vHab;
}
-
projects / wxWidgets.git / blobdiff