From 365d1ec2782e5be83e99e6f676b8e248f6ebf16c Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 9 Oct 2016 20:52:00 +0100
Subject: no ComboBoxes loaded from .src anymore

Change-Id: Ic497dddfe326e9cc06e71c39284b2848d17ae0c8
---
 rsc/inc/rscdb.hxx             |  1 -
 rsc/source/parser/rscicpx.cxx | 26 --------------------------
 rsc/source/parser/rscinit.cxx |  4 ----
 3 files changed, 31 deletions(-)

(limited to 'rsc')

diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 69a85ca5de65..a47de8513726 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -186,7 +186,6 @@ class RscTypCont
                                     RscEnum * pTriState );
     RscTop *    InitClassEdit( RscTop * pSuper );
     RscTop *    InitClassListBox( RscTop * pSuper, RscArray * pStrLst );
-    RscTop *    InitClassComboBox( RscTop * pSuper, RscArray * pStrLst );
     RscTop *    InitClassFixedText( RscTop * pSuper );
     RscTop *    InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
     RscTop *    InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 85fd6a370d09..003555601ee1 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -403,32 +403,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst )
     return pClassListBox;
 }
 
-RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst )
-{
-    Atom        nId;
-    RscTop *    pClassComboBox;
-
-    // initialize class
-    nId = pHS->getID( "ComboBox" );
-    pClassComboBox = new RscClass( nId, RSC_COMBOBOX, pSuper );
-    pClassComboBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
-    aNmTb.Put( nId, CLASSNAME, pClassComboBox );
-
-    // initialize variables
-    INS_WINBIT(pClassComboBox,DropDown)
-    INS_WINBIT(pClassComboBox,Sort)
-    INS_WINBIT(pClassComboBox,HScroll);
-    INS_WINBIT(pClassComboBox,VScroll);
-    INS_WINBIT(pClassComboBox,AutoSize)
-    INS_WINBIT(pClassComboBox,AutoHScroll)
-    INS_WINBIT(pClassComboBox,DDExtraWidth)
-
-    nId = aNmTb.Put( "StringList", VARNAME );
-    pClassComboBox->SetVariable( nId, pStrLst );
-
-    return pClassComboBox;
-}
-
 RscTop * RscTypCont::InitClassFixedText( RscTop * pSuper )
 {
     Atom        nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 2670ed31e1dd..f167cc8d69f2 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -68,7 +68,6 @@ void RscTypCont::Init()
     RscTop   *  pClassImageButton;
     RscTop   *  pClassEdit;
     RscTop   *  pClassListBox;
-    RscTop   *  pClassComboBox;
     RscTop   *  pClassFixedText;
     RscTop   *  pClassFixedImage;
     RscTop   *  pClassKeyCode;
@@ -321,9 +320,6 @@ void RscTypCont::Init()
     pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList );
     pRoot->Insert( pClassListBox );
 
-    pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList );
-    pRoot->Insert( pClassComboBox );
-
     pClassFixedText = InitClassFixedText( pClassControl );
     pRoot->Insert( pClassFixedText );
 
-- 
cgit