No bug - remove unused cruft from OS/2 build

widget/src/os2/nsFrameWindow.cpp

@@ -172,10 +172,6 @@ void nsFrameWindow::RealDoCreate( HWND hwndP, nsWindow *aParent,
    // Subclass frame
    fnwpDefFrame = WinSubclassWindow( mFrameWnd, fnwpFrame);
    WinSetWindowPtr( mFrameWnd, QWL_USER, this);
-#ifdef OLDCODE
-   BOOL brc = (BOOL) WinSendMsg( mFrameWnd, WM_SETICON,
-                                 MPFROMLONG( gWidgetModuleData->GetFrameIcon()), 0);
-#endif
 
    // make the client the client.
    WinSetWindowUShort( mWnd, QWS_ID, FID_CLIENT);

widget/src/os2/nsModule.cpp

@@ -116,9 +116,6 @@ void nsWidgetModuleData::Init( nsIAppShell *aPrimaevalAppShell)
    //                 Both combobox and (atm) nsBrowserWindow depend on this.
    lHtEntryfield = 26;
 
-   hptrFrameIcon = 0;
-   idSelect = 0;
-
    // Work out if the system is DBCS
    COUNTRYCODE cc = { 0 };
    DosQueryDBCSEnv( CCHMAXPATH, &cc, buffer);
@@ -164,12 +161,6 @@ nsWidgetModuleData::~nsWidgetModuleData()
      WinDestroyPointer(hptrArray[i]);
    }
 
-   if( hptrFrameIcon)
-      WinDestroyPointer( hptrFrameIcon);
-#if 0
-   delete mWindows;
-#endif
-
    // finally shut down the appshell.  No more PM.
    // (hope that gfxos2 has gone first!)
    // don't do this if appshell is nsnull for embedding
@@ -177,14 +168,6 @@ nsWidgetModuleData::~nsWidgetModuleData()
      NS_IF_RELEASE(appshell);
 }
 
-HPOINTER nsWidgetModuleData::GetFrameIcon()
-{
-   if( !hptrFrameIcon)
-      hptrFrameIcon = WinLoadPointer( HWND_DESKTOP,
-                                      gModuleHandle, ID_ICO_FRAME);
-   return hptrFrameIcon;
-}
-
 int nsWidgetModuleData::CreateUcsConverter()
 {
    // Create a converter from unicode to a codepage which PM can display.

widget/src/os2/nsModule.h

@@ -66,7 +66,6 @@ class nsWidgetModuleData : public nsISupports
    // We're caching resource-loaded things here too.  This may be
    // better-suited elsewhere, but there shouldn't be very many of them.
    HPOINTER GetPointer( nsCursor aCursor);
-   HPOINTER GetFrameIcon();
 
    // local->Unicode cp. conversion
    ULONG ConvertToUcs( const char *szText, PRUnichar *pBuffer, ULONG ulSize);
@@ -81,22 +80,12 @@ class nsWidgetModuleData : public nsISupports
    const char *DBCSstrchr( const char *string, int c );
    const char *DBCSstrrchr( const char *string, int c );
 
-#if 0
-   HWND     GetWindowForPrinting( PCSZ pszClass, ULONG ulStyle);
-#endif
-
    nsWidgetModuleData();
   ~nsWidgetModuleData();
 
    void Init( nsIAppShell *aPrimaevalAppShell);
 
  private:
-   ULONG        idSelect;    
-   HPOINTER     hptrSelect;  // !! be more sensible about this...
-   HPOINTER     hptrFrameIcon;
-#if 0
-   nsHashtable *mWindows;
-#endif
 
    // Utility function for creating the Unicode conversion object
    int CreateUcsConverter();

widget/src/os2/resource.h

@@ -41,9 +41,6 @@
 #define IDC_CROSS                       4115
 #define IDC_HELP                        4116
 
-// Icons
-#define ID_ICO_FRAME         500
-
 // OS2TODO HCT temporary bug fix
 
 #ifndef FCF_CLOSEBUTTON // defined in the Merlin toolkit

widget/src/os2/widget.rc

@@ -22,9 +22,6 @@
 #include <os2.h>
 #include "resource.h"
 
-/* icons */
-ICON ID_ICO_FRAME         res\frame.ico
-
 /* pointers */
 POINTER IDC_SELECTANCHOR   res\select.ptr
 POINTER IDC_ARROWNORTH     res\arrow_north.ptr