various ids not loaded from .res anymore

Change-Id: Id2fab3e4b7a8feed3107e66d02cdf2a278ae9ef7

include/tools/rcid.h

@@ -58,7 +58,7 @@
 
 #define RSC_FLOATINGWINDOW      (RSC_NOTYPE + 0x39)
 #define RSC_DIALOG              (RSC_NOTYPE + 0x3a)
-#define RSC_MODELESSDIALOG      (RSC_NOTYPE + 0x3b)
+
 #define RSC_MODALDIALOG         (RSC_NOTYPE + 0x3c)
 #define RSC_CONTROL             (RSC_NOTYPE + 0x44)
 #define RSC_BUTTON              (RSC_NOTYPE + 0x45)
@@ -78,13 +78,11 @@
 #define RSC_MULTILINEEDIT       (RSC_NOTYPE + 0x53)
 #define RSC_COMBOBOX            (RSC_NOTYPE + 0x54)
 #define RSC_LISTBOX             (RSC_NOTYPE + 0x55)
-#define RSC_MULTILISTBOX        (RSC_NOTYPE + 0x56)
+
 #define RSC_TEXT                (RSC_NOTYPE + 0x57)
 #define RSC_FIXEDLINE           (RSC_NOTYPE + 0x58)
 
 #define RSC_FIXEDIMAGE          (RSC_NOTYPE + 0x5a)
-#define RSC_GROUPBOX            (RSC_NOTYPE + 0x5c)
-#define RSC_SCROLLBAR           (RSC_NOTYPE + 0x5d)
 
 #define RSC_SPLITTER            (RSC_NOTYPE + 0x5f)
 #define RSC_SPLITWINDOW         (RSC_NOTYPE + 0x60)

rsc/inc/rscdb.hxx

@@ -173,7 +173,6 @@ class RscTypCont
     RscTop *    InitClassSystemWindow( RscTop * pSuper );
     RscTop *    InitClassWorkWindow( RscTop * pSuper );
     RscTop *    InitClassModalDialog( RscTop * pSuper );
-    RscTop *    InitClassModelessDialog( RscTop * pSuper );
     RscTop *    InitClassControl( RscTop * pSuper );
     RscTop *    InitClassCheckBox( RscTop * pSuper );
     RscTop *    InitClassPushButton( RscTop * pSuper );
@@ -185,7 +184,6 @@ class RscTypCont
     RscTop *    InitClassMultiLineEdit( RscTop * pSuper );
     RscTop *    InitClassScrollBar( RscTop * pSuper );
     RscTop *    InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
-    RscTop *    InitClassMultiListBox( RscTop * pSuper );
     RscTop *    InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
     RscTop *    InitClassFixedText( RscTop * pSuper );
     RscTop *    InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );

rsc/source/parser/rscicpx.cxx

@@ -373,20 +373,6 @@ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper )
     return pClassDialog;
 }
 
-RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassDialog;
-
-    // Klasse anlegen
-    nId = pHS->getID( "ModelessDialog" );
-    pClassDialog = new RscClass( nId, RSC_MODELESSDIALOG, pSuper );
-    pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassDialog );
-
-    return pClassDialog;
-}
-
 RscTop * RscTypCont::InitClassControl( RscTop * pSuper )
 {
     Atom        nId;
@@ -596,61 +582,6 @@ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper )
     return pClassMultiLineEdit;
 }
 
-RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassScrollBar;
-
-    // Klasse anlegen
-    nId = pHS->getID( "ScrollBar" );
-    pClassScrollBar = new RscClass( nId, RSC_SCROLLBAR, pSuper );
-    pClassScrollBar->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassScrollBar );
-
-    // Variablen anlegen
-    nId = aNmTb.Put( "MinPos", VARNAME );
-    pClassScrollBar->SetVariable( nId, &aShort );
-    {
-        RSCINST     aDfltI;
-
-        aDfltI = aShort.Create( NULL, RSCINST(), false );
-        aDfltI.pClass->SetNumber( aDfltI, 100 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
-
-        nId = aNmTb.Put( "MaxPos", VARNAME );
-        pClassScrollBar->SetVariable( nId, &aShort, &aDfltI );
-    }
-    nId = aNmTb.Put( "ThumbPos", VARNAME );
-    pClassScrollBar->SetVariable( nId, &aShort );
-    {
-        RSCINST     aDfltI;
-
-        aDfltI = aShort.Create( NULL, RSCINST(), false );
-        aDfltI.pClass->SetNumber( aDfltI, 1 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
-
-        nId = aNmTb.Put( "PageSize", VARNAME);
-        pClassScrollBar->SetVariable( nId, &aShort, &aDfltI  );
-    }
-    {
-        RSCINST     aDfltI;
-
-        aDfltI = aShort.Create( NULL, RSCINST(), false );
-        aDfltI.pClass->SetNumber( aDfltI, 1 );
-//      aDfltI.pClass->MakeDefault( aDfltI );
-        nId = aNmTb.Put( "LineSize", VARNAME );
-        pClassScrollBar->SetVariable( nId, &aShort, &aDfltI );
-    }
-    nId = aNmTb.Put( "VisibleSize", VARNAME );
-    pClassScrollBar->SetVariable( nId, &aShort );
-
-    INS_WINBIT( pClassScrollBar, HScroll );
-    INS_WINBIT( pClassScrollBar, VScroll );
-    INS_WINBIT( pClassScrollBar, Drag )
-
-    return pClassScrollBar;
-}
-
 RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
 {
     Atom        nId;
@@ -683,22 +614,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
     return pClassListBox;
 }
 
-RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper )
-{
-    Atom        nId;
-    RscTop *    pClassMultiListBox;
-
-    // Klasse anlegen
-    nId = pHS->getID( "MultiListBox" );
-    pClassMultiListBox = new RscClass( nId, RSC_MULTILISTBOX, pSuper );
-    pClassMultiListBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassMultiListBox );
-
-    INS_WINBIT(pClassMultiListBox,SimpleMode)
-
-    return pClassMultiListBox;
-}
-
 RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst )
 {
     Atom        nId;

rsc/source/parser/rscinit.cxx

@@ -73,7 +73,6 @@ void RscTypCont::Init()
     RscTop   *  pClassWorkWindow;
     RscTop   *  pClassDialog;
     RscTop   *  pClassModalDialog;
-    RscTop   *  pClassModelessDialog;
     RscTop   *  pClassControl;
     RscTop   *  pClassButton;
     RscTop   *  pClassCheckBox;
@@ -86,13 +85,10 @@ void RscTypCont::Init()
     RscTop   *  pClassTriStateBox;
     RscTop   *  pClassEdit;
     RscTop   *  pClassMultiLineEdit;
-    RscTop   *  pClassScrollBar;
     RscTop   *  pClassListBox;
-    RscTop   *  pClassMultiListBox;
     RscTop   *  pClassComboBox;
     RscTop   *  pClassFixedText;
     RscTop   *  pClassFixedImage;
-    RscTop   *  pClassGroupBox;
     RscTop   *  pClassKeyCode;
     RscTop   *  pLangClassKeyCode;
     RscTop   *  pClassAccelItem;
@@ -378,10 +374,6 @@ void RscTypCont::Init()
     // Klasse anlegen
     pClassModalDialog = InitClassModalDialog( pClassDialog );
     pRoot->Insert( pClassModalDialog );
-
-    // Klasse anlegen
-    pClassModelessDialog = InitClassModelessDialog( pClassDialog );
-    pRoot->Insert( pClassModelessDialog );
 }
 {
     pClassControl = InitClassControl( pClassWindow );
@@ -441,18 +433,11 @@ void RscTypCont::Init()
 
     pClassMultiLineEdit = InitClassMultiLineEdit( pClassEdit );
     pRoot->Insert( pClassMultiLineEdit );
-
-    pClassScrollBar = InitClassScrollBar( pClassControl );
-    pRoot->Insert( pClassScrollBar );
-
 }
 {
     pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList );
     pRoot->Insert( pClassListBox );
 
-    pClassMultiListBox = InitClassMultiListBox( pClassListBox);
-    pRoot->Insert( pClassMultiListBox );
-
     pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList );
     pRoot->Insert( pClassComboBox );
 
@@ -462,13 +447,6 @@ void RscTypCont::Init()
     pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage );
     pRoot->Insert( pClassFixedImage );
 
-    // Klasse anlegen
-    nId = pHS->getID( "GroupBox" );
-    pClassGroupBox = new RscClass( nId, RSC_GROUPBOX, pClassControl );
-    pClassGroupBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassGroupBox );
-    pRoot->Insert( pClassGroupBox );
-
     pClassKeyCode = InitClassKeyCode( pClassMgr, pKey );
     pRoot->Insert( pClassKeyCode );
     {

tools/source/rc/resmgr.cxx

@@ -1460,7 +1460,6 @@ OString ResMgr::GetAutoHelpId()
         switch( pRC->pResource->GetRT() ) {
             case RSC_DOCKINGWINDOW:     aHID.append( "DockingWindow" );    break;
             case RSC_WORKWIN:           aHID.append( "WorkWindow" );       break;
-            case RSC_MODELESSDIALOG:    aHID.append( "ModelessDialog" );   break;
             case RSC_FLOATINGWINDOW:    aHID.append( "FloatingWindow" );   break;
             case RSC_MODALDIALOG:       aHID.append( "ModalDialog" );      break;
             case RSC_TABPAGE:           aHID.append( "TabPage" );          break;
@@ -1474,7 +1473,6 @@ OString ResMgr::GetAutoHelpId()
         switch( pRC1->pResource->GetRT() ) {
             case RSC_DOCKINGWINDOW:
             case RSC_WORKWIN:
-            case RSC_MODELESSDIALOG:
             case RSC_FLOATINGWINDOW:
             case RSC_MODALDIALOG:
             case RSC_TABPAGE:
@@ -1487,7 +1485,6 @@ OString ResMgr::GetAutoHelpId()
                     case RSC_TRISTATEBOX:       aHID.append( "TriStateBox" );      break;
                     case RSC_EDIT:              aHID.append( "Edit" );             break;
                     case RSC_MULTILINEEDIT:     aHID.append( "MultiLineEdit" );    break;
-                    case RSC_MULTILISTBOX:      aHID.append( "MultiListBox" );     break;
                     case RSC_LISTBOX:           aHID.append( "ListBox" );          break;
                     case RSC_COMBOBOX:          aHID.append( "ComboBox" );         break;
                     case RSC_PUSHBUTTON:        aHID.append( "PushButton" );       break;