Kaydet (Commit) feff54d8 authored tarafından Caolán McNamara's avatar Caolán McNamara

MetricBoxes cannot be loaded from .src anymore

Change-Id: Id7b44402975ed75171f4475aa64ebd2a3d6bd687
üst 1de7c36a
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
#define RSC_TIMEFIELD (RSC_NOTYPE + 0x67) #define RSC_TIMEFIELD (RSC_NOTYPE + 0x67)
#define RSC_PATTERNBOX (RSC_NOTYPE + 0x68) #define RSC_PATTERNBOX (RSC_NOTYPE + 0x68)
#define RSC_NUMERICBOX (RSC_NOTYPE + 0x69) #define RSC_NUMERICBOX (RSC_NOTYPE + 0x69)
#define RSC_METRICBOX (RSC_NOTYPE + 0x6a)
......
...@@ -224,7 +224,6 @@ class RscTypCont ...@@ -224,7 +224,6 @@ class RscTypCont
RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime ); RscTop * InitClassTimeField( RscTop * pSuper, RscTop * pClassTime );
RscTop * InitClassPatternBox( RscTop * pSuper ); RscTop * InitClassPatternBox( RscTop * pSuper );
RscTop * InitClassNumericBox( RscTop * pSuper ); RscTop * InitClassNumericBox( RscTop * pSuper );
RscTop * InitClassMetricBox( RscTop * pSuper );
RscTop * InitClassDockingWindow( RscTop * pSuper, RscTop * InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ); RscEnum * pMapUnit );
......
...@@ -1560,23 +1560,6 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper ) ...@@ -1560,23 +1560,6 @@ RscTop * RscTypCont::InitClassNumericBox( RscTop * pSuper )
return pClassNumericBox; return pClassNumericBox;
} }
RscTop * RscTypCont::InitClassMetricBox( RscTop * pSuper )
{
Atom nId;
RscTop * pClassMetricBox;
// Klasse anlegen
nId = pHS->getID( "MetricBox" );
pClassMetricBox = new RscClass( nId, RSC_METRICBOX, pSuper );
pClassMetricBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
aNmTb.Put( nId, CLASSNAME, pClassMetricBox );
// Variablen anlegen
return pClassMetricBox;
}
RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper, RscTop * RscTypCont::InitClassDockingWindow( RscTop * pSuper,
RscEnum * pMapUnit ) RscEnum * pMapUnit )
{ {
......
...@@ -122,7 +122,6 @@ void RscTypCont::Init() ...@@ -122,7 +122,6 @@ void RscTypCont::Init()
RscTop * pClassTimeField; RscTop * pClassTimeField;
RscTop * pClassPatternBox; RscTop * pClassPatternBox;
RscTop * pClassNumericBox; RscTop * pClassNumericBox;
RscTop * pClassMetricBox;
RscTop * pClassDockingWindow; RscTop * pClassDockingWindow;
RscTop * pClassToolBoxItem; RscTop * pClassToolBoxItem;
RscTop * pClassToolBox; RscTop * pClassToolBox;
...@@ -656,16 +655,6 @@ void RscTypCont::Init() ...@@ -656,16 +655,6 @@ void RscTypCont::Init()
} }
} }
{ {
{ // Mehrfachvererbung von Hand
RscTop * pClassTmp = InitClassNumericFormatter( pClassComboBox );
aBaseLst.push_back( pClassTmp );
pClassTmp = InitClassMetricFormatter( pClassTmp, pFieldUnits );
aBaseLst.push_back( pClassTmp );
pClassMetricBox = InitClassMetricBox( pClassTmp );
pRoot->Insert( pClassMetricBox );
}
pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit ); pClassDockingWindow = InitClassDockingWindow( pClassWindow, pMapUnit );
pRoot->Insert( pClassDockingWindow ); pRoot->Insert( pClassDockingWindow );
......
...@@ -1498,7 +1498,6 @@ OString ResMgr::GetAutoHelpId() ...@@ -1498,7 +1498,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_DATEFIELD: aHID.append( "DateField" ); break; case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break;
case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment