# 37239
r = rusty.lynch, a = brendan OS/2 bringup - OS/2 doesn't go down these XP_PC paths git-svn-id: svn://10.0.0.236/trunk@71399 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -88,7 +88,7 @@
|
||||
* Windows PlatformInstance
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(XP_PC)
|
||||
#if defined(XP_PC) && !defined(XP_OS2) // XXXX OS2TODO
|
||||
typedef struct _PlatformInstance
|
||||
{
|
||||
HWND fhWnd;
|
||||
@@ -311,7 +311,7 @@ public:
|
||||
|
||||
void SetMode(nsPluginMode mode) { fMode = mode; }
|
||||
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && !defined(XP_OS2)
|
||||
static LRESULT CALLBACK
|
||||
PluginWindowProc( HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam);
|
||||
#endif
|
||||
@@ -911,7 +911,7 @@ NS_IMETHODIMP SimplePluginInstance::SetText(const char * aText)
|
||||
if(!fText)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
#ifdef XP_PC
|
||||
#if defined(XP_PC) && !defined(XP_OS2)
|
||||
if(fPlatform.fhWnd) {
|
||||
InvalidateRect( fPlatform.fhWnd, NULL, TRUE );
|
||||
UpdateWindow( fPlatform.fhWnd );
|
||||
@@ -1195,7 +1195,7 @@ SimplePluginInstance::PlatformHandleEvent(nsPluginEvent* event)
|
||||
* Windows Implementations
|
||||
*----------------------------------------------------------------------------*/
|
||||
|
||||
#elif defined(XP_PC)
|
||||
#elif defined(XP_PC) && !defined(XP_OS2)
|
||||
const char* gInstanceLookupString = "instance->pdata";
|
||||
|
||||
/*+++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
Reference in New Issue
Block a user