Browse Source

Changes for linux systems

Kolja Strohm 5 years ago
parent
commit
9ca1d03cb1
6 changed files with 14 additions and 7 deletions
  1. 1 3
      DateiSystem.h
  2. 2 0
      Framework Linux.vcxproj
  3. 6 0
      Framework Linux.vcxproj.filters
  4. 2 2
      Text.cpp
  5. 1 0
      UIInitialization.h
  6. 2 2
      UIMLView.cpp

+ 1 - 3
DateiSystem.h

@@ -9,13 +9,11 @@ namespace Framework
 {
     class Bild; // Bild.h
     class Text; // Text.h
+    class FBalken; // Fortschritt.h
 #ifdef WIN32
     class Buchstabe; // Schrift.h
     class Alphabet; // Schrift.h
     class Schrift; // Schrift.h
-    class FBalken; // Fortschritt.h
-#else
-#define FBalken int
 #endif
     class LTDBPixel; // aus dieser Datei
     class LTDBKopf; // aus dieser Datei

+ 2 - 0
Framework Linux.vcxproj

@@ -149,6 +149,7 @@
     <ClCompile Include="Thread.cpp" />
     <ClCompile Include="ToolTip.cpp" />
     <ClCompile Include="UIInitialization.cpp" />
+    <ClCompile Include="UIMLView.cpp" />
     <ClCompile Include="Welt2D.cpp" />
     <ClCompile Include="Welt3D.cpp" />
     <ClCompile Include="XML.cpp" />
@@ -218,6 +219,7 @@
     <ClInclude Include="Tree.h" />
     <ClInclude Include="Trie.h" />
     <ClInclude Include="UIInitialization.h" />
+    <ClInclude Include="UIMLView.h" />
     <ClInclude Include="Vec2.h" />
     <ClInclude Include="Vec3.h" />
     <ClInclude Include="Welt2D.h" />

+ 6 - 0
Framework Linux.vcxproj.filters

@@ -282,6 +282,9 @@
     <ClInclude Include="UIInitialization.h">
       <Filter>Headerdateien\Framework</Filter>
     </ClInclude>
+    <ClInclude Include="UIMLView.h">
+      <Filter>Headerdateien\Framework\Objekte2D</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Prozess.cpp">
@@ -443,5 +446,8 @@
     <ClCompile Include="UIInitialization.cpp">
       <Filter>Quelldateien\Framework</Filter>
     </ClCompile>
+    <ClCompile Include="UIMLView.cpp">
+      <Filter>Quelldateien\Framework\Objekte2D</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

+ 2 - 2
Text.cpp

@@ -87,7 +87,7 @@ void Text::toUpperCase()
     for( int i = 0; txt[ i ]; i++ )
     {
         if( txt[ i ] >= 'a' && txt[ i ] <= 'z' )
-            txt[ i ] -= (char)32;
+            txt[ i ] = (char)( txt[ i ] - 32 );
         switch( txt[ i ] )
         {
         case 'ü':
@@ -110,7 +110,7 @@ void Text::toLowerCase()
     for( int i = 0; txt[ i ]; i++ )
     {
         if( txt[ i ] >= 'A' && txt[ i ] <= 'Z' )
-            txt[ i ] += (char)32;
+            txt[ i ] = (char)( txt[ i ] + 32 );
         switch( txt[ i ] )
         {
         case 'Ü':

+ 1 - 0
UIInitialization.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <functional>
+#include "Betriebssystem.h"
 
 namespace Framework
 {

+ 2 - 2
UIMLView.cpp

@@ -162,7 +162,7 @@ Zeichnung *UIMLView::parseElement( XML::Element *e )
                 t->setStyle( TextFeld::Style::TextGebiet );
             t->setText( e->getText() );
             if( e->hasAttribute( "font-size" ) )
-                t->setSchriftSize( (int)e->getAttributeValue( "font-size" ) );
+                t->setSchriftSize( (unsigned char)(int)e->getAttributeValue( "font-size" ) );
             if( e->hasAttribute( "text-align-horizontal" ) )
             {
                 if( e->getAttributeValue( "text-align-horizontal" ).istGleich( "center" ) )
@@ -180,7 +180,7 @@ Zeichnung *UIMLView::parseElement( XML::Element *e )
             Knopf *k = init.createKnopf( init.initParam );
             k->setText( e->getText() );
             if( e->hasAttribute( "font-size" ) )
-                k->setSchriftSize( (int)e->getAttributeValue( "font-size" ) );
+                k->setSchriftSize( (unsigned char)(int)e->getAttributeValue( "font-size" ) );
             z = k;
         }
         if( e->getName().istGleich( "table" ) )