rename more classes

AlphaField.cpp

@@ -31,7 +31,7 @@ void AlphaFeld::setFarbe(int f) // sets the color
     rend = 1;
 }
 
-void AlphaFeld::render(Bild& zRObj) // draws to zRObj
+void AlphaFeld::render(Image& zRObj) // draws to zRObj
 {
     Drawable::render(zRObj);
     int br = gr.x - 1;

AlphaField.h

@@ -5,7 +5,7 @@
 
 namespace Framework
 {
-    class Bild;      //! Image.h
+    class Image;      //! Image.h
     class AlphaFeld; //! from this file
 
     //! A 2D GUI Framework drawing that represents a color gradient
@@ -30,7 +30,7 @@ namespace Framework
         DLLEXPORT void setFarbe(int f);
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the strength of the alpha field
         DLLEXPORT int getStrength() const;
         //! returns the color of the alpha field in A8R8G8B8 format

Animation.cpp

@@ -58,7 +58,7 @@ void Animation2DData::ladeAnimation(InitDatei* datei)
         --anz;
         transparent = datei->zWert("transparent")->istGleich("true");
     }
-    Bild** bilder = new Bild*[anz];
+    Image** bilder = new Image*[anz];
     int j = 0;
     for (int i = 0; i < anz; ++i)
     {
@@ -84,7 +84,7 @@ void Animation2DData::ladeAnimation(InitDatei* datei)
         }
         ++j;
     }
-    this->bilder = new Bild*[bildAnzahl];
+    this->bilder = new Image*[bildAnzahl];
     j = 0;
     for (int i = 0; i < anz; ++i)
     {
@@ -103,16 +103,16 @@ void Animation2DData::ladeAnimation(LTDBDatei* datei)
     if (!datei) return;
     reset();
     datei->leseDaten(0);
-    int anz = datei->getBildAnzahl();
-    RCArray<Text>* list = datei->zBildListe();
+    int anz = datei->getImageAnzahl();
+    RCArray<Text>* list = datei->zImageListe();
     lock();
-    Bild** bilder = new Bild*[anz];
+    Image** bilder = new Image*[anz];
     for (int i = 0; i < anz; ++i)
     {
         bilder[i] = datei->laden(0, list->get(i));
         if (bilder[i]) ++bildAnzahl;
     }
-    this->bilder = new Bild*[bildAnzahl];
+    this->bilder = new Image*[bildAnzahl];
     int j = 0;
     for (int i = 0; i < anz; ++i)
     {
@@ -145,7 +145,7 @@ void Animation2DData::reset()
 {
     lock();
     for (int i = 0; i < bildAnzahl; ++i)
-        bilder[i] = (Bild*)bilder[i]->release();
+        bilder[i] = (Image*)bilder[i]->release();
     delete[] bilder;
     bilder = 0;
     bildAnzahl = 0;
@@ -156,19 +156,19 @@ void Animation2DData::reset()
 }
 
 // constant
-Bild* Animation2DData::getBild(int i) const
+Image* Animation2DData::getImage(int i) const
 {
     return (i >= 0 && i < bildAnzahl)
-             ? dynamic_cast<Bild*>(bilder[i]->getThis())
+             ? dynamic_cast<Image*>(bilder[i]->getThis())
              : 0;
 }
 
-Bild* Animation2DData::zBild(int i) const
+Image* Animation2DData::zImage(int i) const
 {
     return (i >= 0 && i < bildAnzahl) ? bilder[i] : 0;
 }
 
-int Animation2DData::getBildAnzahl() const
+int Animation2DData::getImageAnzahl() const
 {
     return bildAnzahl;
 }
@@ -211,26 +211,26 @@ Animation2D::~Animation2D()
 }
 
 // non-constant
-void Animation2D::setRahmen(bool ram)
+void Animation2D::setBorder(bool ram)
 {
     rahmen = ram;
 }
 
-void Animation2D::setRahmenZ(Rahmen* ram)
+void Animation2D::setBorderZ(Border* ram)
 {
     if (this->ram) this->ram->release();
     this->ram = ram;
 }
 
-void Animation2D::setRahmenBreite(int br)
+void Animation2D::setBorderWidth(int br)
 {
-    if (!ram) ram = new LRahmen();
+    if (!ram) ram = new LBorder();
     ram->setRamenBreite(br);
 }
 
-void Animation2D::setRahmenFarbe(int f)
+void Animation2D::setBorderColor(int f)
 {
-    if (!ram) ram = new LRahmen();
+    if (!ram) ram = new LBorder();
     ram->setFarbe(f);
 }
 
@@ -291,12 +291,12 @@ bool Animation2D::tick(double zeit)
     {
         ausgleich -= 1.0 / data->getFPS();
         ++jetzt;
-        if (jetzt >= data->getBildAnzahl())
+        if (jetzt >= data->getImageAnzahl())
         {
             if (data->istWiederhohlend())
                 jetzt = 0;
             else
-                jetzt = data->getBildAnzahl();
+                jetzt = data->getImageAnzahl();
         }
     }
     data->unlock();
@@ -305,7 +305,7 @@ bool Animation2D::tick(double zeit)
     return Drawable::tick(zeit);
 }
 
-void Animation2D::render(Bild& zRObj)
+void Animation2D::render(Image& zRObj)
 {
     lockDrawable();
     if (!data)
@@ -315,13 +315,13 @@ void Animation2D::render(Bild& zRObj)
     }
     Drawable::render(zRObj);
     data->lock();
-    if (data->zBild(jetzt))
+    if (data->zImage(jetzt))
     {
         zRObj.setAlpha(alpha);
         if (data->istTransparent())
-            zRObj.alphaBild(pos.x, pos.y, gr.x, gr.y, *data->zBild(jetzt));
+            zRObj.alphaImage(pos.x, pos.y, gr.x, gr.y, *data->zImage(jetzt));
         else
-            zRObj.drawBild(pos.x, pos.y, gr.x, gr.y, *data->zBild(jetzt));
+            zRObj.drawImage(pos.x, pos.y, gr.x, gr.y, *data->zImage(jetzt));
         if (ram && rahmen)
         {
             ram->setPosition(pos);
@@ -365,22 +365,22 @@ bool Animation2D::hatRahmen() const
     return rahmen;
 }
 
-Rahmen* Animation2D::getRahmen() const
+Border* Animation2D::getBorder() const
 {
-    return ram ? dynamic_cast<Rahmen*>(ram->getThis()) : 0;
+    return ram ? dynamic_cast<Border*>(ram->getThis()) : 0;
 }
 
-Rahmen* Animation2D::zRahmen() const
+Border* Animation2D::zBorder() const
 {
     return ram;
 }
 
-int Animation2D::getRahmenBreite() const
+int Animation2D::getBorderWidth() const
 {
     return ram ? ram->getRBreite() : 0;
 }
 
-int Animation2D::getRahmenFarbe() const
+int Animation2D::getBorderColor() const
 {
     return ram ? ram->getFarbe() : 0;
 }
@@ -400,11 +400,11 @@ Drawable* Animation2D::dublizieren() const
     ret->setAPS(aps);
     ret->setSichtbar(sichtbar);
     ret->setAlphaMaske(maxAlpha);
-    ret->setRahmen(rahmen);
+    ret->setBorder(rahmen);
     if (ram)
     {
-        ret->setRahmenBreite(ram->getRBreite());
-        ret->setRahmenFarbe(ram->getFarbe());
+        ret->setBorderWidth(ram->getRBreite());
+        ret->setBorderColor(ram->getFarbe());
     }
     return ret;
 }

Animation.h

@@ -6,16 +6,16 @@
 
 namespace Framework
 {
-    class Bild;      //! Image.h
+    class Image;      //! Image.h
     class LTDBDatei; //! FileSystem.h
     class InitDatei; //! InitFile.h
-    class Rahmen;    //! Border.h
+    class Border;    //! Border.h
 
     //! Contains all images of a video animation
     class Animation2DData : public virtual ReferenceCounter
     {
     private:
-        Bild** bilder;
+        Image** bilder;
         int bildAnzahl;
         int fps;
         bool wiederhohlen;
@@ -61,13 +61,13 @@ namespace Framework
         DLLEXPORT void reset();
         //! Returns a specific image of the animation
         //! \param i The index of the image
-        DLLEXPORT Bild* getBild(int i) const;
+        DLLEXPORT Image* getImage(int i) const;
         //! Returns a specific image of the animation without increasing the
         //! reference counter
         //! \param i The index of the image
-        DLLEXPORT Bild* zBild(int i) const;
+        DLLEXPORT Image* zImage(int i) const;
         //! Returns the number of images in the animation
-        DLLEXPORT int getBildAnzahl() const;
+        DLLEXPORT int getImageAnzahl() const;
         //! Returns the number of frames per second
         DLLEXPORT int getFPS() const;
         //! Returns whether the animation repeats when it reaches the last
@@ -87,7 +87,7 @@ namespace Framework
         unsigned char alpha;
         unsigned char maxAlpha;
         bool rahmen;
-        Rahmen* ram;
+        Border* ram;
         int aps;
         bool sichtbar;
 
@@ -98,16 +98,16 @@ namespace Framework
         DLLEXPORT virtual ~Animation2D();
         //! Sets whether a border should be drawn around the animation
         //! \param ram 1 if a border should be drawn
-        DLLEXPORT void setRahmen(bool ram);
+        DLLEXPORT void setBorder(bool ram);
         //! Sets a pointer to the used border
         //! \param ram The border
-        DLLEXPORT void setRahmenZ(Rahmen* ram);
+        DLLEXPORT void setBorderZ(Border* ram);
         //! Sets the width of the border
         //! \param br The width in pixels
-        DLLEXPORT void setRahmenBreite(int br);
+        DLLEXPORT void setBorderWidth(int br);
         //! Sets the color of the border
         //! \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setRahmenFarbe(int fc);
+        DLLEXPORT void setBorderColor(int fc);
         //! Sets the animation to be displayed
         //! \param data The animation data
         DLLEXPORT void setAnimationDataZ(Animation2DData* data);
@@ -127,7 +127,7 @@ namespace Framework
         DLLEXPORT bool tick(double zeit) override;
         //! Draws the animation into a specific image
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the animation data
         DLLEXPORT Animation2DData* getAnimationData() const;
         //! Returns the animation data without increasing the reference counter
@@ -141,14 +141,14 @@ namespace Framework
         //! Returns whether a border is drawn around the animation
         DLLEXPORT bool hatRahmen() const;
         //! Returns the border of the animation
-        DLLEXPORT Rahmen* getRahmen() const;
+        DLLEXPORT Border* getBorder() const;
         //! Returns the border of the animation without increasing the
         //! reference counter
-        DLLEXPORT Rahmen* zRahmen() const;
+        DLLEXPORT Border* zBorder() const;
         //! Returns the width of the border in pixels
-        DLLEXPORT int getRahmenBreite() const;
+        DLLEXPORT int getBorderWidth() const;
         //! Returns the color of the border in A8R8G8B8 format
-        DLLEXPORT int getRahmenFarbe() const;
+        DLLEXPORT int getBorderColor() const;
         //! Copies the animation so that it can be modified without
         //! affecting the original
         DLLEXPORT Drawable* dublizieren() const override;

Border.cpp

@@ -8,9 +8,9 @@
 
 using namespace Framework;
 
-// Contents of the Rahmen class from Border.h
+// Contents of the Border class from Border.h
 // Constructor
-Rahmen::Rahmen()
+Border::Border()
     : Drawable(),
       br(1),
       farbe(0xFF000000),
@@ -19,10 +19,10 @@ Rahmen::Rahmen()
 {}
 
 // Destructor
-Rahmen::~Rahmen() {}
+Border::~Border() {}
 
 // non-constant
-void Rahmen::setRamenBreite(int br) // sets the width of the border
+void Border::setRamenBreite(int br) // sets the width of the border
 {
     this->br = br;
     rend = 1;
@@ -30,7 +30,7 @@ void Rahmen::setRamenBreite(int br) // sets the width of the border
 
 // when this flag is set, the border is drawn dashed
 //  br: 1 -> dashed, 0 -> solid
-void Rahmen::setBreaks(bool br, int brOff, int brLength, int lineLength)
+void Border::setBreaks(bool br, int brOff, int brLength, int lineLength)
 {
     breaks = br;
     breakOffset = brOff;
@@ -39,69 +39,69 @@ void Rahmen::setBreaks(bool br, int brOff, int brLength, int lineLength)
     rend = 1;
 }
 
-void Rahmen::setAlpha(
+void Border::setAlpha(
     bool a) // Sets whether the alpha value of the color should be considered
 {
     alpha = a;
     rend = 1;
 }
 
-void Rahmen::setFarbe(int f) // Sets the color of the border
+void Border::setFarbe(int f) // Sets the color of the border
 {
     farbe = f;
     rend = 1;
 }
 
-int Rahmen::getFarbe() const // Returns the color of the border
+int Border::getFarbe() const // Returns the color of the border
 {
     return farbe;
 }
 
-bool Rahmen::hatAlpha()
+bool Border::hatAlpha()
     const // Returns whether the alpha value of the color is considered
 {
     return alpha;
 }
 
-int Rahmen::getRBreite() const // Returns the width of the border
+int Border::getRBreite() const // Returns the width of the border
 {
     return br;
 }
 
 // Returns 1 if the border is drawn dashed
-bool Rahmen::hasBreaks() const
+bool Border::hasBreaks() const
 {
     return breaks;
 }
 
 // starting point of the first line segment
-int Rahmen::getBreakOffset() const
+int Border::getBreakOffset() const
 {
     return breakOffset;
 }
 
 // length of a gap
-int Rahmen::getBreakLength() const
+int Border::getBreakLength() const
 {
     return breakLength;
 }
 
 // length of a line
-int Rahmen::getLineLength() const
+int Border::getLineLength() const
 {
     return lineLength;
 }
 
-// Contents of the LRahmen class from Border.h
+// Contents of the LBorder class from Border.h
 // Constructor
-LRahmen::LRahmen()
-    : Rahmen()
+LBorder::LBorder()
+    : Border()
 {}
 
 // Destructor
-LRahmen::~LRahmen() {}
+LBorder::~LBorder() {}
 
-void LRahmen::render(Bild& Obj) // Draws the border into the render object
+void LBorder::render(Image& Obj) // Draws the border into the render object
 {
     Drawable::render(Obj);
     int x = 0;
@@ -212,9 +212,9 @@ void LRahmen::render(Bild& Obj) // Draws the border into the render object
     Obj.releaseDrawOptions();
 }
 
-Drawable* LRahmen::dublizieren() const // Copies the drawing
+Drawable* LBorder::dublizieren() const // Copies the drawing
 {
-    Rahmen* obj = new LRahmen();
+    Border* obj = new LBorder();
     obj->setPosition(pos);
     obj->setSize(gr);
     obj->setMausEreignisParameter(makParam);
@@ -229,10 +229,10 @@ Drawable* LRahmen::dublizieren() const // Copies the drawing
     return obj;
 }
 
-// Contents of the Rahmen3D class from Border.h
+// Contents of the Border3D class from Border.h
 // Constructor
-Rahmen3D::Rahmen3D()
-    : Rahmen()
+Border3D::Border3D()
+    : Border()
 {
     alpha = 1;
     farbe = 0x70FFFFFF;
@@ -240,9 +240,9 @@ Rahmen3D::Rahmen3D()
 }
 
 // Destructor
-Rahmen3D::~Rahmen3D() {}
+Border3D::~Border3D() {}
 
-void Rahmen3D::render(Bild& Obj) // Draws the border into the render object
+void Border3D::render(Image& Obj) // Draws the border into the render object
 {
     Drawable::render(Obj);
     int x = 0;
@@ -354,9 +354,9 @@ void Rahmen3D::render(Bild& Obj) // Draws the border into the render object
     Obj.releaseDrawOptions();
 }
 
-Drawable* Rahmen3D::dublizieren() const // Copies the drawing
+Drawable* Border3D::dublizieren() const // Copies the drawing
 {
-    Rahmen* obj = new Rahmen3D();
+    Border* obj = new Border3D();
     obj->setPosition(pos);
     obj->setSize(gr);
     obj->setMausEreignisParameter(makParam);

Border.h

@@ -5,9 +5,9 @@
 
 namespace Framework
 {
-    class Bild; //! Image.h
+    class Image; //! Image.h
 
-    class Rahmen : public Drawable
+    class Border : public Drawable
     {
     protected:
         int br;
@@ -20,9 +20,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Rahmen();
+        DLLEXPORT Border();
         //! Destructor
-        DLLEXPORT virtual ~Rahmen();
+        DLLEXPORT virtual ~Border();
         //! Sets the width of the border
         //! \param br The width in pixels
         DLLEXPORT void setRamenBreite(int br);
@@ -57,33 +57,33 @@ namespace Framework
 
     //! A 2D GUI Framework drawing that draws a line border around a
     //! rectangle
-    class LRahmen : public Rahmen
+    class LBorder : public Border
     {
     private:
 
     public:
         //! Constructor
-        DLLEXPORT LRahmen();
+        DLLEXPORT LBorder();
         //! Destructor
-        DLLEXPORT virtual ~LRahmen();
+        DLLEXPORT virtual ~LBorder();
         //! Draws the border
         //! \param zRObj The image to draw the border into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Copies the border so that it can be modified without affecting
         //! the original
         DLLEXPORT Drawable* dublizieren() const override;
     };
 
-    class Rahmen3D : public Rahmen
+    class Border3D : public Border
     {
     public:
         //! Constructor
-        DLLEXPORT Rahmen3D();
+        DLLEXPORT Border3D();
         //! Destructor
-        DLLEXPORT virtual ~Rahmen3D();
+        DLLEXPORT virtual ~Border3D();
         //! Draws the border
         //! \param zRObj The image to draw the border into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Copies the border so that it can be modified without affecting
         //! the original
         DLLEXPORT Drawable* dublizieren() const override;

Button.cpp

@@ -18,31 +18,31 @@ using namespace Framework;
 // Contents of the Knopf class from Button.h
 // Constructor
 Knopf::Knopf()
-    : TextFeld(),
+    : TextField(),
       klickFarbe(0xFF000000),
-      klickBild(0),
+      klickImage(0),
       klickBuffer(0),
       klickIndex(0)
 {
     style
-        = Style::Erlaubt | Style::Buffered | Style::KlickBuffer | Style::Rahmen;
+        = Style::Erlaubt | Style::Buffered | Style::KlickBuffer | Style::Border;
     this->setMausEreignis(_ret1ME);
     setSchriftFarbe(0xFFFFFFFF);
     setSchriftSize(12);
-    setRahmenBreite(2);
-    setRahmenFarbe(0xFF00FF00);
+    setBorderWidth(2);
+    setBorderColor(0xFF00FF00);
     setAlphaFeldFarbe(0x5500FF00);
     setAlphaFeldStrength(-5);
     setKBFarbe(0xFF000000);
     setKBStrength(20);
-    addStyle(TextFeld::Style::Center);
+    addStyle(TextField::Style::Center);
 }
 
 // Destructor
 Knopf::~Knopf()
 {
     if (klickBuffer) klickBuffer->release();
-    if (klickBild) klickBild->release();
+    if (klickImage) klickImage->release();
 }
 
 void Knopf::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
@@ -76,13 +76,13 @@ void Knopf::setKlickFarbe(int fc) // sets the click color
     rend = 1;
 }
 
-void Knopf::setKlickBild(Bild* bild) // sets the click image
+void Knopf::setKlickImage(Image* bild) // sets the click image
 {
     if (bild)
     {
-        if (!klickBild) klickBild = new Bild();
-        klickBild->neuBild(bild->getBreite(), bild->getHeight(), 0);
-        int* buff1 = klickBild->getBuffer();
+        if (!klickImage) klickImage = new Image();
+        klickImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
+        int* buff1 = klickImage->getBuffer();
         int* buff2 = bild->getBuffer();
         for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
             buff1[i] = buff2[i];
@@ -91,10 +91,10 @@ void Knopf::setKlickBild(Bild* bild) // sets the click image
     }
 }
 
-void Knopf::setKlickBildZ(Bild* bild) // sets a pointer to the click image
+void Knopf::setKlickImageZ(Image* bild) // sets a pointer to the click image
 {
-    if (klickBild) klickBild->release();
-    klickBild = bild;
+    if (klickImage) klickImage->release();
+    klickImage = bild;
     rend = 1;
 }
 
@@ -123,10 +123,10 @@ void Knopf::setKBFarbe(int fc) // sets the click buffer color
 //  te: The event triggered by the keyboard input
 void Knopf::doTastaturEreignis(TastaturEreignis& te) {}
 
-void Knopf::render(Bild& zRObj) // renders int zRObj
+void Knopf::render(Image& zRObj) // renders int zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
-    addStyle(TextFeld::Style::Center);
+    addStyle(TextField::Style::Center);
     bool erlaubt = hatStyle(Style::Erlaubt);
     bool rA = 0;
     if (!hatStyle(Style::Erlaubt))
@@ -136,7 +136,7 @@ void Knopf::render(Bild& zRObj) // renders int zRObj
     }
     bool tmpRend = rend;
     removeStyle(Style::VScroll | Style::HScroll | Style::Erlaubt);
-    TextFeld::render(zRObj);
+    TextField::render(zRObj);
     if (!zRObj.setDrawOptions(innenPosition, innenSize))
     {
         if (rA) zRObj.releaseAlpha();
@@ -152,12 +152,12 @@ void Knopf::render(Bild& zRObj) // renders int zRObj
             else
                 zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, klickFarbe);
         }
-        if (hatStyle(Style::KlickBild) && klickBild)
+        if (hatStyle(Style::KlickImage) && klickImage)
         {
             if (hatStyle(Style::KlickAlpha))
-                zRObj.alphaBild(0, 0, innenSize.x, innenSize.y, *klickBild);
+                zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *klickImage);
             else
-                zRObj.drawBild(0, 0, innenSize.x, innenSize.y, *klickBild);
+                zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *klickImage);
         }
         if (hatStyle(Style::KlickBuffer) && klickBuffer)
         {
@@ -177,15 +177,15 @@ int Knopf::getKlickFarbe() const // returns the click color
     return klickFarbe;
 }
 
-Bild* Knopf::getKlickBild() const // returns the click image
+Image* Knopf::getKlickImage() const // returns the click image
 {
-    if (!klickBild) return 0;
-    return dynamic_cast<Bild*>(klickBild->getThis());
+    if (!klickImage) return 0;
+    return dynamic_cast<Image*>(klickImage->getThis());
 }
 
-Bild* Knopf::zKlickBild() const // returns a pointer to the click image
+Image* Knopf::zKlickImage() const // returns a pointer to the click image
 {
-    return klickBild;
+    return klickImage;
 }
 
 AlphaFeld* Knopf::getKB() const // returns the click buffer
@@ -225,16 +225,16 @@ Knopf::dublizieren() const // creates a copy of the drawing and returns it
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
     obj->setSchriftSize(getSchriftSize());
-    if (zSchrift()) obj->setSchriftZ(getSchrift());
+    if (zFont()) obj->setFontZ(getFont());
     if (zText()) obj->setText(zText()->getText());
     obj->setHintergrundFarbe(hintergrundFarbe);
     obj->setSchriftFarbe(getSchriftFarbe());
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (vertikalScrollBar)
     {
         obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());
@@ -252,7 +252,7 @@ Knopf::dublizieren() const // creates a copy of the drawing and returns it
     obj->setSchowChar(getShowChar());
     // obj->setAuswahl( getSelectionPos(), getCursorPos() );
     obj->setKlickFarbe(klickFarbe);
-    if (klickBild) obj->setKlickBild(dynamic_cast<Bild*>(klickBild->getThis()));
+    if (klickImage) obj->setKlickImage(dynamic_cast<Image*>(klickImage->getThis()));
     if (klickBuffer) obj->setKBZ((AlphaFeld*)klickBuffer->dublizieren());
     return obj;
 }
@@ -298,7 +298,7 @@ void KontrollKnopf::doMausEreignis(
     MausEreignis& me, bool userRet) // process mouse events
 {
     if (me.id == ME_Leaves || !userRet) style &= ~Style::MausKlick;
-    if (hatStyleNicht(TextFeld::Style::Erlaubt) || !userRet) return;
+    if (hatStyleNicht(TextField::Style::Erlaubt) || !userRet) return;
     if (me.id == ME_Betritt && hatStyle(Style::MausKlick) != MausStand[M_Links])
         setStyle(Style::MausKlick, MausStand[M_Links]);
     if (me.id == ME_PLinks) addStyle(Style::MausKlick);
@@ -361,12 +361,12 @@ void KontrollKnopf::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void KontrollKnopf::setSchriftZ(Schrift* schrift) // sets the font
+void KontrollKnopf::setFontZ(Font* schrift) // sets the font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
     else
-        textRd->setSchriftZ(schrift);
+        textRd->setFontZ(schrift);
     rend = 1;
 }
 
@@ -394,34 +394,34 @@ void KontrollKnopf::setKBgFarbe(int f) // sets the click background color
     rend = 1;
 }
 
-void KontrollKnopf::setSBgBildZ(Bild* b) // sets the select background image
+void KontrollKnopf::setSBgImageZ(Image* b) // sets the select background image
 {
     if (sBgB) sBgB->release();
     sBgB = b;
     rend = 1;
 }
 
-void KontrollKnopf::setSBgBild(Bild* b)
+void KontrollKnopf::setSBgImage(Image* b)
 {
-    if (!sBgB) sBgB = new Bild();
-    sBgB->neuBild(b->getBreite(), b->getHeight(), 0);
-    sBgB->drawBild(0, 0, b->getBreite(), b->getHeight(), *b);
+    if (!sBgB) sBgB = new Image();
+    sBgB->neuImage(b->getBreite(), b->getHeight(), 0);
+    sBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
 
-void KontrollKnopf::setKBgBildZ(Bild* b) // sets the click background image
+void KontrollKnopf::setKBgImageZ(Image* b) // sets the click background image
 {
     if (kBgB) kBgB->release();
     kBgB = b;
     rend = 1;
 }
 
-void KontrollKnopf::setKBgBild(Bild* b)
+void KontrollKnopf::setKBgImage(Image* b)
 {
-    if (!kBgB) kBgB = new Bild();
-    kBgB->neuBild(b->getBreite(), b->getHeight(), 0);
-    kBgB->drawBild(0, 0, b->getBreite(), b->getHeight(), *b);
+    if (!kBgB) kBgB = new Image();
+    kBgB->neuImage(b->getBreite(), b->getHeight(), 0);
+    kBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
@@ -503,7 +503,7 @@ void KontrollKnopf::loadData(
     }
 }
 
-void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
+void KontrollKnopf::render(Image& zRObj) // renders into zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
     removeStyle(Style::VScroll | Style::HScroll);
@@ -523,12 +523,12 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
             else
                 zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, kBgF);
         }
-        if (hatStyle(Style::KlickBild) && kBgB)
+        if (hatStyle(Style::KlickImage) && kBgB)
         {
             if (hatStyle(Style::KlickAlpha))
-                zRObj.alphaBild(0, 0, innenSize.x, innenSize.y, *kBgB);
+                zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *kBgB);
             else
-                zRObj.drawBild(0, 0, innenSize.x, innenSize.y, *kBgB);
+                zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *kBgB);
         }
         if (hatStyle(Style::KlickBuffer) && kAf)
         {
@@ -539,7 +539,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
         if (hatStyle(Style::Selected) && sKasten)
         {
             if (sTxt && textRd)
-                zRObj.drawBild(0,
+                zRObj.drawImage(0,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
@@ -547,7 +547,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
                     innenSize.y,
                     *sKasten);
             else
-                zRObj.drawBild(gr.x / 2 - sKasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - sKasten->getBreite() / 2,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
@@ -568,7 +568,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
         else if (kasten)
         {
             if (txt && textRd)
-                zRObj.drawBild(0,
+                zRObj.drawImage(0,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
@@ -576,7 +576,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
                     innenSize.y,
                     *kasten);
             else
-                zRObj.drawBild(gr.x / 2 - kasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - kasten->getBreite() / 2,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
@@ -604,12 +604,12 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
             else
                 zRObj.fillRegion(0, 0, innenSize.x, innenSize.y, sBgF);
         }
-        if (hatStyle(Style::SelectBild) && sBgB)
+        if (hatStyle(Style::SelectImage) && sBgB)
         {
             if (hatStyle(Style::SelectAlpha))
-                zRObj.alphaBild(0, 0, innenSize.x, innenSize.y, *sBgB);
+                zRObj.alphaImage(0, 0, innenSize.x, innenSize.y, *sBgB);
             else
-                zRObj.drawBild(0, 0, innenSize.x, innenSize.y, *sBgB);
+                zRObj.drawImage(0, 0, innenSize.x, innenSize.y, *sBgB);
         }
         if (hatStyle(Style::SelectBuffer) && sAf)
         {
@@ -620,7 +620,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
         if (sKasten)
         {
             if (sTxt && textRd)
-                zRObj.drawBild(0,
+                zRObj.drawImage(0,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
@@ -628,7 +628,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
                     innenSize.y,
                     *sKasten);
             else
-                zRObj.drawBild(gr.x / 2 - sKasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - sKasten->getBreite() / 2,
                     (gr.y / 2 - sKasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - sKasten->getHeight() / 2),
@@ -653,7 +653,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
         if (kasten)
         {
             if (txt && textRd)
-                zRObj.drawBild(0,
+                zRObj.drawImage(0,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
@@ -661,7 +661,7 @@ void KontrollKnopf::render(Bild& zRObj) // renders into zRObj
                     innenSize.y,
                     *kasten);
             else
-                zRObj.drawBild(gr.x / 2 - kasten->getBreite() / 2,
+                zRObj.drawImage(gr.x / 2 - kasten->getBreite() / 2,
                     (gr.y / 2 - kasten->getHeight() / 2) < 0
                         ? 0
                         : (gr.y / 2 - kasten->getHeight() / 2),
@@ -705,14 +705,14 @@ Text* KontrollKnopf::zSText() const
     return sTxt;
 }
 
-Schrift* KontrollKnopf::getSchrift() const // returns the font
+Font* KontrollKnopf::getFont() const // returns the font
 {
-    return textRd ? textRd->getSchrift() : 0;
+    return textRd ? textRd->getFont() : 0;
 }
 
-Schrift* KontrollKnopf::zSchrift() const
+Font* KontrollKnopf::zFont() const
 {
-    return textRd ? textRd->zSchrift() : 0;
+    return textRd ? textRd->zFont() : 0;
 }
 
 int KontrollKnopf::getSFarbe() const // returns the font color
@@ -735,22 +735,22 @@ int KontrollKnopf::getKBgFarbe() const // returns the click background color
     return kBgF;
 }
 
-Bild* KontrollKnopf::getSBgBild() const // returns the select background image
+Image* KontrollKnopf::getSBgImage() const // returns the select background image
 {
-    return sBgB ? dynamic_cast<Bild*>(sBgB->getThis()) : 0;
+    return sBgB ? dynamic_cast<Image*>(sBgB->getThis()) : 0;
 }
 
-Bild* KontrollKnopf::zSBgBild() const
+Image* KontrollKnopf::zSBgImage() const
 {
     return sBgB;
 }
 
-Bild* KontrollKnopf::getKBgBild() const // returns the click background image
+Image* KontrollKnopf::getKBgImage() const // returns the click background image
 {
-    return kBgB ? dynamic_cast<Bild*>(kBgB->getThis()) : 0;
+    return kBgB ? dynamic_cast<Image*>(kBgB->getThis()) : 0;
 }
 
-Bild* KontrollKnopf::zKBgBild() const
+Image* KontrollKnopf::zKBgImage() const
 {
     return kBgB;
 }

Button.h

@@ -5,18 +5,18 @@
 
 namespace Framework
 {
-    class TextFeld;      //! TextField.h
+    class TextField;      //! TextField.h
     class AlphaFeld;     //! AlphaField.h
     class Text;          //! Text.h
-    class Schrift;       //! Font.h
-    class Rahmen;        //! Border.h
+    class Font;       //! Font.h
+    class Border;        //! Border.h
     class LTDBDatei;     //! FileSystem.h
     class Knopf;         //! from this file
     class KontrollKnopf; //! from this file
     class TextRenderer;
 
     //! A 2D GUI Framework drawing that renders a button that the user can press
-    class Knopf : public TextFeld
+    class Knopf : public TextField
     {
     public:
         class Style : public DrawableBackground::Style
@@ -29,7 +29,7 @@ namespace Framework
             static const __int64 KlickFarbe = 0x0020000;
             //! Specifies whether the button has a background image
             //! while being pressed
-            static const __int64 KlickBild = 0x0040000;
+            static const __int64 KlickImage = 0x0040000;
             //! Specifies whether the button uses alpha blending
             //! for the background while being pressed
             static const __int64 KlickAlpha = 0x0080000;
@@ -37,15 +37,15 @@ namespace Framework
             //! while being pressed
             static const __int64 KlickBuffer = 0x0100000;
 
-            //! Combines flags Sichtbar, Erlaubt, Rahmen,
+            //! Combines flags Sichtbar, Erlaubt, Border,
             //! Buffered, MehrfarbigText, KlickBuffer
-            static const __int64 Normal = Sichtbar | Erlaubt | Rahmen | Buffered
+            static const __int64 Normal = Sichtbar | Erlaubt | Border | Buffered
                                         | MehrfarbigText | KlickBuffer;
         };
 
     private:
         int klickFarbe;
-        Bild* klickBild;
+        Image* klickImage;
         AlphaFeld* klickBuffer;
         int klickIndex;
         //! Processes mouse messages
@@ -63,11 +63,11 @@ namespace Framework
         //! Sets the background image by copying, used when the button is
         //! pressed
         //! \param bild The image to copy
-        DLLEXPORT void setKlickBild(Bild* bild);
+        DLLEXPORT void setKlickImage(Image* bild);
         //! Sets a pointer to the background image used when the button is
         //! pressed
         //! \param bild The new image
-        DLLEXPORT void setKlickBildZ(Bild* bild);
+        DLLEXPORT void setKlickImageZ(Image* bild);
         //! Sets a pointer to the color gradient used when the button is pressed
         //! \param af The new color gradient
         DLLEXPORT void setKBZ(AlphaFeld* af);
@@ -83,15 +83,15 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the background color in A8R8G8B8 format used when
         //! the button is pressed
         DLLEXPORT int getKlickFarbe() const;
         //! Returns the background image used when the button is pressed
-        DLLEXPORT Bild* getKlickBild() const;
+        DLLEXPORT Image* getKlickImage() const;
         //! Returns the background image without increased reference counter
         //! used when the button is pressed
-        DLLEXPORT Bild* zKlickBild() const;
+        DLLEXPORT Image* zKlickImage() const;
         //! Returns the color gradient used when the button is pressed
         DLLEXPORT AlphaFeld* getKB() const;
         //! Returns the color gradient without increased reference counter
@@ -125,7 +125,7 @@ namespace Framework
             static const __int64 KlickFarbe = 0x002000;
             //! Specifies whether the checkbox has a background image
             //! when clicked
-            static const __int64 KlickBild = 0x004000;
+            static const __int64 KlickImage = 0x004000;
             //! Specifies whether alpha blending is used for the
             //! checkbox background when clicked
             static const __int64 KlickAlpha = 0x008000;
@@ -137,7 +137,7 @@ namespace Framework
             static const __int64 SelectFarbe = 0x020000;
             //! Specifies whether the checkbox has a background image
             //! while selected
-            static const __int64 SelectBild = 0x040000;
+            static const __int64 SelectImage = 0x040000;
             //! Specifies whether alpha blending is used for the
             //! checkbox background while selected
             static const __int64 SelectAlpha = 0x080000;
@@ -153,10 +153,10 @@ namespace Framework
             //! with the mouse. (Managed by the checkbox itself)
             static const __int64 MausKlick = 0x800000;
 
-            //! Combines the flags Sichtbar, Erlaubt, Rahmen,
+            //! Combines the flags Sichtbar, Erlaubt, Border,
             //! KlickBuffer
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Rahmen | KlickBuffer;
+                = Sichtbar | Erlaubt | Border | KlickBuffer;
         };
 
     private:
@@ -164,12 +164,12 @@ namespace Framework
         Text* sTxt;
         int sBgF;
         int kBgF;
-        Bild* sBgB;
-        Bild* kBgB;
+        Image* sBgB;
+        Image* kBgB;
         AlphaFeld* sAf;
         AlphaFeld* kAf;
-        Bild* kasten;
-        Bild* sKasten;
+        Image* kasten;
+        Image* sKasten;
         TextRenderer* textRd;
         int sF;
         int sGr;
@@ -205,7 +205,7 @@ namespace Framework
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the font to use for the label
         //! \param schrift The font
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Sets the color of the font used for the label
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setSFarbe(int f);
@@ -220,16 +220,16 @@ namespace Framework
         DLLEXPORT void setKBgFarbe(int f);
         //! Sets a pointer to the background image used while the checkbox
         //! is selected \param b The image
-        DLLEXPORT void setSBgBildZ(Bild* b);
+        DLLEXPORT void setSBgImageZ(Image* b);
         //! Sets the background image by copying, used while the checkbox
         //! is selected \param b The image to copy
-        DLLEXPORT void setSBgBild(Bild* b);
+        DLLEXPORT void setSBgImage(Image* b);
         //! Sets a pointer to the background image used while the checkbox
         //! is being clicked \param b The image
-        DLLEXPORT void setKBgBildZ(Bild* b);
+        DLLEXPORT void setKBgImageZ(Image* b);
         //! Sets the background image by copying, used while the checkbox
         //! is being clicked \param b The image to copy
-        DLLEXPORT void setKBgBild(Bild* b);
+        DLLEXPORT void setKBgImage(Image* b);
         //! Sets a pointer to the color gradient used while the checkbox
         //! is selected \param af The color gradient
         DLLEXPORT void setSAlphaFeldZ(AlphaFeld* af);
@@ -260,7 +260,7 @@ namespace Framework
         DLLEXPORT void loadData(const char* ltdb);
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the label
         DLLEXPORT Text* getText() const;
         //! Returns the label without increased reference counter
@@ -271,9 +271,9 @@ namespace Framework
         //! while the checkbox is selected
         DLLEXPORT Text* zSText() const;
         //! Returns the font used
-        DLLEXPORT Schrift* getSchrift() const;
+        DLLEXPORT Font* getFont() const;
         //! Returns the font used without increased reference counter
-        DLLEXPORT Schrift* zSchrift() const;
+        DLLEXPORT Font* zFont() const;
         //! Returns the font color in A8R8G8B8 format
         DLLEXPORT int getSFarbe() const;
         //! Returns the font size
@@ -285,15 +285,15 @@ namespace Framework
         //! the checkbox is being clicked
         DLLEXPORT int getKBgFarbe() const;
         //! Returns the background image used while the checkbox is selected
-        DLLEXPORT Bild* getSBgBild() const;
+        DLLEXPORT Image* getSBgImage() const;
         //! Returns the background image without increased reference counter
         //! used while the checkbox is selected
-        DLLEXPORT Bild* zSBgBild() const;
+        DLLEXPORT Image* zSBgImage() const;
         //! Returns the background image used while the checkbox is being clicked
-        DLLEXPORT Bild* getKBgBild() const;
+        DLLEXPORT Image* getKBgImage() const;
         //! Returns the background image without increased reference counter
         //! used while the checkbox is being clicked
-        DLLEXPORT Bild* zKBgBild() const;
+        DLLEXPORT Image* zKBgImage() const;
         //! Returns the color gradient used while the checkbox is selected
         DLLEXPORT AlphaFeld* getSAlphaFeld() const;
         //! Returns the color gradient without increased reference counter

Camera2D.cpp

@@ -88,7 +88,7 @@ bool Kamera2D::tick(double time)
     return DrawableBackground::tick(time);
 }
 
-void Kamera2D::render(Bild& zRObj)
+void Kamera2D::render(Image& zRObj)
 {
     if (hatStyleNicht(Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);

Camera2D.h

@@ -32,7 +32,7 @@ namespace Framework
         __declspec(dllexport) void setZoom(float zoom);
         __declspec(dllexport) void setWelt(Welt2D* welt, bool tick);
         __declspec(dllexport) bool tick(double time);
-        __declspec(dllexport) void render(Bild& zRObj);
+        __declspec(dllexport) void render(Image& zRObj);
         __declspec(dllexport) Vertex getWorldCoordinates(Punkt screenPos);
         __declspec(dllexport) Vertex getWorldDirection(Vertex dir);
         __declspec(dllexport) Vertex getWorldPosition();

Camera3D.cpp

@@ -125,7 +125,7 @@ void Kam3D::setRotation(Vec3<float> rotation)
 
 // Sets the position of the image on the screen
 //  p: A point with x and y coordinates in pixels
-void Kam3D::setBildschirmPosition(Punkt p)
+void Kam3D::setScreenPosition(Punkt p)
 {
     viewport.x = (float)p.x;
     viewport.y = (float)p.y;
@@ -134,7 +134,7 @@ void Kam3D::setBildschirmPosition(Punkt p)
 // Sets the position of the image on the screen
 //  x: The x coordinate in pixels
 //  y: The y coordinate in pixels
-void Kam3D::setBildschirmPosition(int x, int y)
+void Kam3D::setScreenPosition(int x, int y)
 {
     viewport.x = (float)x;
     viewport.y = (float)y;
@@ -142,7 +142,7 @@ void Kam3D::setBildschirmPosition(int x, int y)
 
 // Sets the size of the image on the screen
 //  p: A point, with x as width and y as height in pixels
-void Kam3D::setBildschirmSize(Punkt p)
+void Kam3D::setScreenSize(Punkt p)
 {
     viewport.width = (float)p.x;
     viewport.height = (float)p.y;
@@ -152,7 +152,7 @@ void Kam3D::setBildschirmSize(Punkt p)
 // Sets the size of the image on the screen
 //  br: The width in pixels
 //  hoe: The height in pixels
-void Kam3D::setBildschirmSize(int br, int hoe)
+void Kam3D::setScreenSize(int br, int hoe)
 {
     viewport.width = (float)br;
     viewport.height = (float)hoe;

Camera3D.h

@@ -82,18 +82,18 @@ namespace Framework
         DLLEXPORT void setRotation(Vec3<float> rotation);
         //! Sets the position of the image on the screen
         //! \param p A point with x and y coordinates in pixels
-        DLLEXPORT void setBildschirmPosition(Punkt p);
+        DLLEXPORT void setScreenPosition(Punkt p);
         //! Sets the position of the image on the screen
         //! \param x The x coordinate in pixels
         //! \param y The y coordinate in pixels
-        DLLEXPORT void setBildschirmPosition(int x, int y);
+        DLLEXPORT void setScreenPosition(int x, int y);
         //! Sets the size of the image on the screen
         //! \param p A point with x as width and y as height in pixels
-        DLLEXPORT void setBildschirmSize(Punkt p);
+        DLLEXPORT void setScreenSize(Punkt p);
         //! Sets the size of the image on the screen
         //! \param br The width in pixels
         //! \param hi The height in pixels
-        DLLEXPORT void setBildschirmSize(int br, int hi);
+        DLLEXPORT void setScreenSize(int br, int hi);
         //! Sets the world to be drawn
         //! \param w The world
         DLLEXPORT void setWelt(Welt3D* w);

DX11GraphicsApi.cpp

@@ -147,7 +147,7 @@ typedef HRESULT(__stdcall* D3D11CreateDeviceAndSwapChainFunction)(IDXGIAdapter*,
     ID3D11DeviceContext**);
 
 void DirectX11::initialize(
-    WFenster* fenster, Vec2<int> backBufferSize, bool fullScreen)
+    NativeWindow* fenster, Vec2<int> backBufferSize, bool fullScreen)
 {
     if (d3d11Device)
         return GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
@@ -158,7 +158,7 @@ void DirectX11::initialize(
     HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("dxgi.dll konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -170,7 +170,7 @@ void DirectX11::initialize(
     if (!createFactory)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text(
                 "Der Einstiegspunkt CreateDXGIFactory2 fon dxgi.dll konnte "
@@ -185,7 +185,7 @@ void DirectX11::initialize(
         getDLLRegister()->releaseDLL("dxgi.dll");
         Logging::error() << "ERROR DXGI: createFactory returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("createFactory ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -214,7 +214,7 @@ void DirectX11::initialize(
     HINSTANCE dll = getDLLRegister()->ladeDLL("d3d11.dll", "d3d11.dll");
     if (!dll)
     {
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -227,7 +227,7 @@ void DirectX11::initialize(
     {
         getDLLRegister()->releaseDLL("d3d11.dll");
         getDLLRegister()->releaseDLL("dxgi.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("Der Einstiegspunkt D3D11CreateDeviceAndSwapChain fon "
                      "DirectX 11 konnte nicht gefunden werden."),
@@ -248,7 +248,7 @@ void DirectX11::initialize(
     scd.SampleDesc.Count = 1;   // multisampling setting
     scd.SampleDesc.Quality = 0; // vendor-specific flag
     scd.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL;
-    scd.OutputWindow = fenster ? fenster->getFensterHandle() : 0;
+    scd.OutputWindow = fenster ? fenster->getWindowHandle() : 0;
     scd.BufferDesc.Width = this->backBufferSize.x;
     scd.BufferDesc.Height = this->backBufferSize.y; // windowed/full-screen mode
 
@@ -278,7 +278,7 @@ void DirectX11::initialize(
         getDLLRegister()->releaseDLL("dxgi.dll");
         Logging::error() << "ERROR: D3D11CreateDeviceAndSwapChain returned "
                          << result << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -292,7 +292,7 @@ void DirectX11::initialize(
     {
         Logging::error() << "ERROR: d3d11SpawChain->GetBuffer returned "
                          << result << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -314,7 +314,7 @@ void DirectX11::initialize(
         Logging::error()
             << "ERROR: d3d11Device->CreateRenderTargetView returned " << result
             << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -341,7 +341,7 @@ void DirectX11::initialize(
     {
         Logging::error() << "ERROR: d3d11Device->CreateTexture2D returned "
                          << result << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -376,7 +376,7 @@ void DirectX11::initialize(
         Logging::error()
             << "ERROR: d3d11Device->CreateDepthStencilState returned " << result
             << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -400,7 +400,7 @@ void DirectX11::initialize(
         Logging::error()
             << "ERROR: d3d11Device->CreateDepthStencilView returned " << result
             << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -440,7 +440,7 @@ void DirectX11::initialize(
         Logging::error()
             << "ERROR: d3d11Device->CreateDepthStencilState returned " << result
             << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -476,7 +476,7 @@ void DirectX11::initialize(
     {
         Logging::error() << "ERROR: d3d11Device->CreateSamplerState returned "
                          << result << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 11 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -484,11 +484,11 @@ void DirectX11::initialize(
     }
     //---------------------------------------------------------------
     // Framework Backbuffer Texture
-    Bild* renderB = new Bild(1);
+    Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuBild(this->backBufferSize.x, this->backBufferSize.y, 0);
+    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
 
-    uiTextur = createOrGetTextur("_f_Render_Bild", renderB);
+    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
     ((DX11Textur*)uiTextur)->setUseMips(0);
 
     texturModel = new TexturModel(this, "_framework_gui_");
@@ -545,8 +545,8 @@ void DirectX11::initialize(
 
     d3d11Context->RSSetState(texturRS);
 
-    Bild* b = new Bild();
-    b->neuBild(10, 10, 0xFFFFFFFF);
+    Image* b = new Image();
+    b->neuImage(10, 10, 0xFFFFFFFF);
     defaultTextur = createOrGetTextur("_default_textur", b);
 
     diffuseLights = new DX11StructuredBuffer(
@@ -646,14 +646,14 @@ void DirectX11::update()
         d3d11Context->Release();
         d3d11Context = NULL;
     }
-    initialize(dynamic_cast<WFenster*>(fenster->getThis()),
+    initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
         backBufferSize,
         fullScreen);
 }
 
 void DirectX11::beginFrame(bool fill2D, bool fill3D, int fillColor)
 {
-    if (fill2D) uiTextur->zBild()->setFarbe(fillColor);
+    if (fill2D) uiTextur->zImage()->setFarbe(fillColor);
     if (fill3D || true)
     {
         float color[4];
@@ -904,8 +904,8 @@ void DirectX11::renderKamera(Kam3D* zKamera, Textur* zTarget)
     D3D11_TEXTURE2D_DESC depthBufferDesc;
     ZeroMemory(&depthBufferDesc, sizeof(depthBufferDesc));
     // Set up the description of the depth buffer.
-    depthBufferDesc.Width = zTarget->zBild()->getBreite();
-    depthBufferDesc.Height = zTarget->zBild()->getHeight();
+    depthBufferDesc.Width = zTarget->zImage()->getBreite();
+    depthBufferDesc.Height = zTarget->zImage()->getHeight();
     depthBufferDesc.MipLevels = 1;
     depthBufferDesc.ArraySize = 1;
     depthBufferDesc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT;
@@ -976,26 +976,26 @@ void DirectX11::presentFrame()
     if (pixelShader)
         pixelShader->fuellConstBuffer((char*)&kamPos, 0, sizeof(float) * 3);
 
-    if (fenster && !IsIconic(fenster->getFensterHandle()))
+    if (fenster && !IsIconic(fenster->getWindowHandle()))
         renderObject(texturModel);
     HRESULT result = d3d11SpawChain->Present(0, 0);
     if (!SUCCEEDED(result))
     {
         HRESULT res = d3d11Device->GetDeviceRemovedReason();
         update();
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Es ist ein Fehler beim rendern aufgetreten."),
             MB_ICONERROR);
     }
 }
 
-Bild* DirectX11::zUIRenderBild() const
+Image* DirectX11::zUIRenderImage() const
 {
-    return uiTextur->zBild();
+    return uiTextur->zImage();
 }
 
-Textur* DirectX11::createOrGetTextur(const char* name, Bild* b)
+Textur* DirectX11::createOrGetTextur(const char* name, Image* b)
 {
     if (!d3d11Device)
     {
@@ -1005,11 +1005,11 @@ Textur* DirectX11::createOrGetTextur(const char* name, Bild* b)
     if (texturRegister->hatTextur(name))
     {
         Textur* ret = texturRegister->getTextur(name);
-        if (b) ret->setBildZ(b);
+        if (b) ret->setImageZ(b);
         return ret;
     }
     Textur* ret = new DX11Textur(d3d11Device, d3d11Context);
-    if (b) ret->setBildZ(b);
+    if (b) ret->setImageZ(b);
     texturRegister->addTextur(dynamic_cast<Textur*>(ret->getThis()), name);
     return ret;
 }

DX12GraphicsApi.cpp

@@ -114,7 +114,7 @@ typedef HRESULT(__stdcall* DXGIGetDebugInterface1Function)(
     UINT Flags, REFIID riid, _COM_Outptr_ void** pDebug);
 
 void DirectX12::initialize(
-    WFenster* fenster, Vec2<int> backBufferSize, bool fullScreen)
+    NativeWindow* fenster, Vec2<int> backBufferSize, bool fullScreen)
 {
     if (device)
         return GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
@@ -123,7 +123,7 @@ void DirectX12::initialize(
     HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("dxgi.dll konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -133,7 +133,7 @@ void DirectX12::initialize(
     if (!d3d12DLL)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 12 konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -146,7 +146,7 @@ void DirectX12::initialize(
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
         getDLLRegister()->releaseDLL("d3d12.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text(
                 "Der Einstiegspunkt CreateDXGIFactory2 fon dxgi.dll konnte "
@@ -161,7 +161,7 @@ void DirectX12::initialize(
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
         getDLLRegister()->releaseDLL("d3d12.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("Der Einstiegspunkt D3D12CreateDevice fon DirectX 12 "
                      "konnte nicht gefunden werden."),
@@ -205,7 +205,7 @@ void DirectX12::initialize(
         getDLLRegister()->releaseDLL("d3d12.dll");
         Logging::error() << "ERROR DXGI: createFactory returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("createFactory ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -259,7 +259,7 @@ void DirectX12::initialize(
         factory->Release();
         getDLLRegister()->releaseDLL("dxgi.dll");
         getDLLRegister()->releaseDLL("d3d12.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("Es wurde keine passende Grafigkarte gefunden."),
             MB_ICONERROR);
@@ -276,7 +276,7 @@ void DirectX12::initialize(
         getDLLRegister()->releaseDLL("dxgi.dll");
         getDLLRegister()->releaseDLL("d3d12.dll");
         Logging::error() << "ERROR: createDevice returned " << res << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("createDevice ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -293,7 +293,7 @@ void DirectX12::initialize(
         getDLLRegister()->releaseDLL("dxgi.dll");
         getDLLRegister()->releaseDLL("d3d12.dll");
         Logging::error() << "ERROR: Raytracing is not available\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("Raytracing ist nicht verfügbar. DirectX12 kann nicht "
                      "verwendet werden."),
@@ -361,7 +361,7 @@ void DirectX12::initialize(
     swapChainDesc.Flags = tearing ? DXGI_SWAP_CHAIN_FLAG_ALLOW_TEARING : 0;
     IDXGISwapChain1* tmpSwapChain;
     res = factory->CreateSwapChainForHwnd(directCommandQueue->getQueue(),
-        fenster->getFensterHandle(),
+        fenster->getWindowHandle(),
         &swapChainDesc,
         0,
         0,
@@ -371,7 +371,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateSwapChainForHwnd returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateSwapChainForHwnd ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -384,14 +384,14 @@ void DirectX12::initialize(
     {
         factory->Release();
         Logging::error() << "ERROR: QueryInterface returned " << res << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("QueryInterface ist Fehlgeschlagen."),
             MB_ICONERROR);
         return;
     }
     factory->MakeWindowAssociation(
-        fenster->getFensterHandle(), DXGI_MWA_NO_ALT_ENTER);
+        fenster->getWindowHandle(), DXGI_MWA_NO_ALT_ENTER);
 
     D3D12_DESCRIPTOR_HEAP_DESC rtvhdesc = {};
     rtvhdesc.NumDescriptors = 2; // back buffer count
@@ -403,7 +403,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateDescriptorHeap returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateDescriptorHeap ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -424,7 +424,7 @@ void DirectX12::initialize(
         {
             factory->Release();
             Logging::error() << "ERROR: GetBuffer returned " << res << "\n";
-            WMessageBox(fenster->getFensterHandle(),
+            WMessageBox(fenster->getWindowHandle(),
                 new Text("Fehler"),
                 new Text("GetBuffer ist Fehlgeschlagen."),
                 MB_ICONERROR);
@@ -454,10 +454,10 @@ void DirectX12::initialize(
 
     texturModel = new TexturModel(this, "_framework_gui_");
 
-    Bild* renderB = new Bild(1);
+    Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuBild(this->backBufferSize.x, this->backBufferSize.y, 0);
-    uiTextur = createOrGetTextur("_f_Render_Bild", renderB);
+    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
+    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
 
     texturModel->setSize(Vec2<float>(2.f, 2.f));
     texturModel->setTextur(dynamic_cast<Textur*>(uiTextur->getThis()));
@@ -494,7 +494,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateCommittedResource returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateCommittedResource ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -512,7 +512,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateDescriptorHeap returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateDescriptorHeap ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -539,7 +539,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateDescriptorHeap returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateDescriptorHeap ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -658,7 +658,7 @@ void DirectX12::initialize(
         Logging::error()
             << "ERROR: D3DX12SerializeVersionedRootSignature returned " << res
             << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text(
                 "D3DX12SerializeVersionedRootSignature ist Fehlgeschlagen."),
@@ -677,7 +677,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreateRootSignature returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateRootSignature ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -760,7 +760,7 @@ void DirectX12::initialize(
         factory->Release();
         Logging::error() << "ERROR: CreatePipelineState returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreatePipelineState ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -780,7 +780,7 @@ void DirectX12::update()
     HINSTANCE dxgiDLL = getDLLRegister()->ladeDLL("dxgi.dll", "dxgi.dll");
     if (!dxgiDLL)
     {
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("dxgi.dll konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -792,7 +792,7 @@ void DirectX12::update()
     if (!createFactory)
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("Der Einstiegspunkt CreateDXGIFactory2 fon DXGI konnte "
                      "nicht gefunden werden."),
@@ -805,7 +805,7 @@ void DirectX12::update()
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
         Logging::error() << "ERROR: GetDesc returned " << res << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("GetDesc ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -822,7 +822,7 @@ void DirectX12::update()
     {
         getDLLRegister()->releaseDLL("dxgi.dll");
         Logging::error() << "ERROR: createFactory returned " << res << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("createFactory ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -855,7 +855,7 @@ void DirectX12::update()
             getDLLRegister()->releaseDLL("dxgi.dll");
             factory->Release();
             Logging::error() << "ERROR: GetBuffer returned " << res << "\n";
-            WMessageBox(fenster->getFensterHandle(),
+            WMessageBox(fenster->getWindowHandle(),
                 new Text("Fehler"),
                 new Text("GetBuffer ist Fehlgeschlagen."),
                 MB_ICONERROR);
@@ -907,7 +907,7 @@ void DirectX12::update()
         factory->Release();
         Logging::error() << "ERROR: CreateCommittedResource returned " << res
                          << "\n";
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("CreateCommittedResource ist Fehlgeschlagen."),
             MB_ICONERROR);
@@ -925,10 +925,10 @@ void DirectX12::update()
 
     if (uiTextur) uiTextur->release();
 
-    Bild* renderB = new Bild(1);
+    Image* renderB = new Image(1);
     renderB->setAlpha3D(1);
-    renderB->neuBild(this->backBufferSize.x, this->backBufferSize.y, 0);
-    uiTextur = createOrGetTextur("_f_Render_Bild", renderB);
+    renderB->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0);
+    uiTextur = createOrGetTextur("_f_Render_Image", renderB);
 
     texturModel->setTextur(dynamic_cast<Textur*>(uiTextur->getThis()));
 
@@ -948,7 +948,7 @@ void DirectX12::beginFrame(bool fill2D, bool fill3D, int fillColor)
 
     directCommandQueue->getCommandList()->ResourceBarrier(1, &barrier);
 
-    if (fill2D) uiTextur->zBild()->setFarbe(fillColor);
+    if (fill2D) uiTextur->zImage()->setFarbe(fillColor);
     if (fill3D)
     {
         float color[4];
@@ -1167,7 +1167,7 @@ void DirectX12::presentFrame()
 
     uiTextur->updateTextur();
 
-    if (fenster && !IsIconic(fenster->getFensterHandle()))
+    if (fenster && !IsIconic(fenster->getWindowHandle()))
         renderObject(texturModel);
 
     D3D12_RESOURCE_BARRIER barrier;
@@ -1188,7 +1188,7 @@ void DirectX12::presentFrame()
     backBufferIndex = swapChain->GetCurrentBackBufferIndex();
 }
 
-Textur* DirectX12::createOrGetTextur(const char* name, Bild* b)
+Textur* DirectX12::createOrGetTextur(const char* name, Image* b)
 {
     if (!device)
     {
@@ -1198,11 +1198,11 @@ Textur* DirectX12::createOrGetTextur(const char* name, Bild* b)
     if (texturRegister->hatTextur(name))
     {
         Textur* ret = texturRegister->getTextur(name);
-        if (b) ret->setBildZ(b);
+        if (b) ret->setImageZ(b);
         return ret;
     }
     Textur* ret = new DX12Textur(device, copyCommandQueue, directCommandQueue);
-    if (b) ret->setBildZ(b);
+    if (b) ret->setImageZ(b);
     texturRegister->addTextur(dynamic_cast<Textur*>(ret->getThis()), name);
     ret->updateTextur();
     copyCommandQueue->execute();
@@ -1210,9 +1210,9 @@ Textur* DirectX12::createOrGetTextur(const char* name, Bild* b)
     return ret;
 }
 
-Bild* DirectX12::zUIRenderBild() const
+Image* DirectX12::zUIRenderImage() const
 {
-    return uiTextur ? uiTextur->zBild() : 0;
+    return uiTextur ? uiTextur->zImage() : 0;
 }
 
 bool DirectX12::isAvailable()

DX9GraphicsApi.cpp

@@ -19,7 +19,7 @@ DirectX9::DirectX9()
       pBackBuffer(0),
       backRect(new D3DLOCKED_RECT())
 {
-    uiBild = new Bild(1);
+    uiImage = new Image(1);
 }
 
 DirectX9::~DirectX9()
@@ -42,13 +42,13 @@ DirectX9::~DirectX9()
         pDirect3D = NULL;
         getDLLRegister()->releaseDLL("d3d9.dll");
     }
-    uiBild->release();
+    uiImage->release();
 }
 
 typedef IDirect3D9*(__stdcall* D3D9CreateFunction)(UINT);
 
 void DirectX9::initialize(
-    WFenster* fenster, Vec2<int> backBufferSize, bool fullScreen)
+    NativeWindow* fenster, Vec2<int> backBufferSize, bool fullScreen)
 {
     if (pDirect3D)
         return GraphicsApi::initialize(fenster, backBufferSize, fullScreen);
@@ -57,7 +57,7 @@ void DirectX9::initialize(
     HINSTANCE dll = getDLLRegister()->ladeDLL("d3d9.dll", "d3d9.dll");
     if (!dll)
     {
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("DirectX 9 konnte nicht gefunden werden."),
             MB_ICONERROR);
@@ -68,7 +68,7 @@ void DirectX9::initialize(
     if (!direct3DCreate9)
     {
         getDLLRegister()->releaseDLL("d3d9.dll");
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Der Einstiegspunkt Direct3DCreate9 fon DirectX 9 konnte "
                      "nicht gefunden werden."),
@@ -80,7 +80,7 @@ void DirectX9::initialize(
     D3DPRESENT_PARAMETERS d3dpp;
     ZeroMemory(&d3dpp, sizeof(d3dpp));
     d3dpp.Windowed = !fullScreen;
-    d3dpp.hDeviceWindow = fenster ? fenster->getFensterHandle() : 0;
+    d3dpp.hDeviceWindow = fenster ? fenster->getWindowHandle() : 0;
     d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
     d3dpp.BackBufferFormat = D3DFMT_X8R8G8B8;
     d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
@@ -88,16 +88,16 @@ void DirectX9::initialize(
     d3dpp.BackBufferHeight = this->backBufferSize.y;
     d3dpp.BackBufferWidth = this->backBufferSize.x;
 
-    uiBild->neuBild(this->backBufferSize.x, this->backBufferSize.y, 0xFF000000);
+    uiImage->neuImage(this->backBufferSize.x, this->backBufferSize.y, 0xFF000000);
 
     HRESULT result = pDirect3D->CreateDevice(D3DADAPTER_DEFAULT,
         D3DDEVTYPE_HAL,
-        fenster->getFensterHandle(),
+        fenster->getWindowHandle(),
         D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE,
         &d3dpp,
         &pDevice);
     if (result != S_OK)
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("DirectX 9 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -105,7 +105,7 @@ void DirectX9::initialize(
         result = pDevice->GetBackBuffer(
             0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer);
     if (result != S_OK)
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("DirectX 9 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -128,7 +128,7 @@ void DirectX9::update()
     D3DPRESENT_PARAMETERS d3dpp;
     ZeroMemory(&d3dpp, sizeof(d3dpp));
     d3dpp.Windowed = !fullScreen;
-    d3dpp.hDeviceWindow = fenster->getFensterHandle();
+    d3dpp.hDeviceWindow = fenster->getWindowHandle();
     d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
     d3dpp.BackBufferFormat = D3DFMT_X8R8G8B8;
     d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_ONE;
@@ -138,16 +138,16 @@ void DirectX9::update()
     d3dpp.BackBufferHeight = backBufferSize.y;
     d3dpp.BackBufferWidth = backBufferSize.x;
 
-    uiBild->neuBild(backBufferSize.x, backBufferSize.y, 0xFF000000);
+    uiImage->neuImage(backBufferSize.x, backBufferSize.y, 0xFF000000);
 
     HRESULT result = pDirect3D->CreateDevice(D3DADAPTER_DEFAULT,
         D3DDEVTYPE_HAL,
-        fenster->getFensterHandle(),
+        fenster->getWindowHandle(),
         D3DCREATE_HARDWARE_VERTEXPROCESSING | D3DCREATE_PUREDEVICE,
         &d3dpp,
         &pDevice);
     if (result != S_OK)
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 9 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -155,7 +155,7 @@ void DirectX9::update()
         result = pDevice->GetBackBuffer(
             0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer);
     if (result != S_OK)
-        WMessageBox(fenster->getFensterHandle(),
+        WMessageBox(fenster->getWindowHandle(),
             new Text("Fehler"),
             new Text("DirectX 9 konnte nicht initialisiert werden."),
             MB_ICONERROR);
@@ -163,7 +163,7 @@ void DirectX9::update()
 
 void DirectX9::beginFrame(bool fill2D, bool fill3D, int fillColor)
 {
-    if (fill2D) uiBild->setFarbe(fillColor);
+    if (fill2D) uiImage->setFarbe(fillColor);
 }
 
 void DirectX9::renderKamera(Kam3D* zKamera)
@@ -189,7 +189,7 @@ void DirectX9::renderKamera(Kam3D* zKamera)
             wPoint = inv * wPoint;
             wPoint2 = inv * wPoint2;
             Vec3<float> wDir = wPoint2 - wPoint;
-            uiBild->setPixelDP(x + (int)zKamera->zViewPort()->x,
+            uiImage->setPixelDP(x + (int)zKamera->zViewPort()->x,
                 y + (int)zKamera->zViewPort()->y,
                 welt->traceRay(wPoint, wDir));
         }
@@ -200,28 +200,28 @@ void DirectX9::renderKamera(Kam3D* zKamera)
 
 void DirectX9::presentFrame()
 {
-    if (!uiBild->getBuffer()) return;
+    if (!uiImage->getBuffer()) return;
     HRESULT result;
     result = pBackBuffer->LockRect(backRect, 0, 0);
     if (result != S_OK)
     {
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Es ist ein Fehler beim rendern aufgetreten."),
             MB_ICONERROR);
         update();
     }
-    // kopieren zum Bildschrirm
-    int* bgBuff = uiBild->getBuffer();
-    int tmpBr = sizeof(D3DCOLOR) * uiBild->getBreite();
-    for (int y = 0, pitch = 0, bry = 0; y < uiBild->getHeight();
-         ++y, pitch += backRect->Pitch, bry += uiBild->getBreite())
+    // kopieren zum Screen
+    int* bgBuff = uiImage->getBuffer();
+    int tmpBr = sizeof(D3DCOLOR) * uiImage->getBreite();
+    for (int y = 0, pitch = 0, bry = 0; y < uiImage->getHeight();
+         ++y, pitch += backRect->Pitch, bry += uiImage->getBreite())
         memcpy(&((BYTE*)backRect->pBits)[pitch], (void*)&(bgBuff[bry]), tmpBr);
-    // Beende Bild
+    // Beende Image
     result = pBackBuffer->UnlockRect();
     if (result != S_OK)
     {
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Es ist ein Fehler beim rendern aufgetreten."),
             MB_ICONERROR);
@@ -229,7 +229,7 @@ void DirectX9::presentFrame()
     }
     if (result != S_OK)
     {
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Es ist ein Fehler beim rendern aufgetreten."),
             MB_ICONERROR);
@@ -238,7 +238,7 @@ void DirectX9::presentFrame()
     result = pDevice->Present(0, 0, 0, 0);
     if (result != S_OK)
     {
-        WMessageBox(fenster ? fenster->getFensterHandle() : 0,
+        WMessageBox(fenster ? fenster->getWindowHandle() : 0,
             new Text("Fehler"),
             new Text("Es ist ein Fehler beim rendern aufgetreten."),
             MB_ICONERROR);
@@ -246,16 +246,16 @@ void DirectX9::presentFrame()
     }
 }
 
-Textur* DirectX9::createOrGetTextur(const char* name, Bild* b)
+Textur* DirectX9::createOrGetTextur(const char* name, Image* b)
 {
     Textur* ret = new DX9Textur();
-    ret->setBildZ(b);
+    ret->setImageZ(b);
     return ret;
 }
 
-Bild* DirectX9::zUIRenderBild() const
+Image* DirectX9::zUIRenderImage() const
 {
-    return uiBild;
+    return uiImage;
 }
 
 DXBuffer* DirectX9::createIndexBuffer()

Diagram.cpp

@@ -48,12 +48,12 @@ void SLDiag::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void SLDiag::setSchriftZ(Schrift* schrift) // sets the font
+void SLDiag::setFontZ(Font* schrift) // sets the font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
     else
-        textRd->setSchriftZ(schrift);
+        textRd->setFontZ(schrift);
     rend = 1;
 }
 
@@ -81,7 +81,7 @@ void SLDiag::addLinie(Text* txt)
     lName->add(txt, lines);
     ph->add(new Array<int>(), lines);
     pb->add(new Array<int>(), lines);
-    int rbr = rahmen && hatStyle(Style::Rahmen) ? rahmen->getRBreite() : 0;
+    int rbr = rahmen && hatStyle(Style::Border) ? rahmen->getRBreite() : 0;
     pb->z(lines)->set(gr.x - rbr * 2, 0);
     ++lines;
     rend = 1;
@@ -130,7 +130,7 @@ void SLDiag::removeLinie(int lNum) // removes a line
     rend = 1;
 }
 
-void SLDiag::render(Bild& zRObj) // draws to zRObj
+void SLDiag::render(Image& zRObj) // draws to zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -212,15 +212,15 @@ void SLDiag::render(Bild& zRObj) // draws to zRObj
 }
 
 // constant
-Schrift* SLDiag::getSchrift() const // returns the font
+Font* SLDiag::getFont() const // returns the font
 {
-    if (textRd) return textRd->getSchrift();
+    if (textRd) return textRd->getFont();
     return 0;
 }
 
-Schrift* SLDiag::zSchrift() const
+Font* SLDiag::zFont() const
 {
-    return textRd ? textRd->zSchrift() : 0;
+    return textRd ? textRd->zFont() : 0;
 }
 
 const Punkt& SLDiag::getGSize() const // returns the grid size
@@ -1160,12 +1160,12 @@ LDiag::LDiag()
     : DrawableBackground(),
       BaseDiag(&cs),
       textRd(0),
-      dRam(new LRahmen()),
+      dRam(new LBorder()),
       dBgF(0),
       dBgB(0),
       dAf(new AlphaFeld()),
-      vIntervallRB(new Bild()),
-      hIntervallRB(new Bild()),
+      vIntervallRB(new Image()),
+      hIntervallRB(new Image()),
       schriftGr(12)
 {
     style = Style::MELockDrawable;
@@ -1190,7 +1190,7 @@ void LDiag::doMausEreignis(MausEreignis& me, bool userRet)
         && (hatStyle(Style::HScroll) || hatStyle(Style::VScroll)) && userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
         bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
@@ -1217,13 +1217,13 @@ void LDiag::setTextRendererZ(TextRenderer* textRd)
     unlockDrawable();
 }
 
-void LDiag::setSchriftZ(Schrift* schrift) // Sets the font
+void LDiag::setFontZ(Font* schrift) // Sets the font
 {
     lockDrawable();
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
     else
-        textRd->setSchriftZ(schrift);
+        textRd->setFontZ(schrift);
     rend = 1;
     unlockDrawable();
 }
@@ -1236,8 +1236,8 @@ void LDiag::setSchriftSize(int gr)
     unlockDrawable();
 }
 
-void LDiag::setDatenRahmenZ(
-    Rahmen* ram) // Sets the inner border around the actual diagram
+void LDiag::setDataBorderZ(
+    Border* ram) // Sets the inner border around the actual diagram
 {
     lockDrawable();
     if (dRam) dRam->release();
@@ -1246,10 +1246,10 @@ void LDiag::setDatenRahmenZ(
     rend = 1;
 }
 
-void LDiag::setDatenRahmen(Rahmen* ram)
+void LDiag::setDataBorder(Border* ram)
 {
     lockDrawable();
-    if (!dRam) dRam = new LRahmen();
+    if (!dRam) dRam = new LBorder();
     dRam->setAlpha(ram->hatAlpha());
     dRam->setFarbe(ram->getFarbe());
     dRam->setRamenBreite(ram->getRBreite());
@@ -1261,7 +1261,7 @@ void LDiag::setDatenRahmen(Rahmen* ram)
 void LDiag::setDatenRahmenBreite(int br)
 {
     lockDrawable();
-    if (!dRam) dRam = new LRahmen();
+    if (!dRam) dRam = new LBorder();
     if (dRam->getRBreite() != br) rend = 1;
     dRam->setRamenBreite(br);
     unlockDrawable();
@@ -1270,7 +1270,7 @@ void LDiag::setDatenRahmenBreite(int br)
 void LDiag::setDatenRahmenFarbe(int f)
 {
     lockDrawable();
-    if (!dRam) dRam = new LRahmen();
+    if (!dRam) dRam = new LBorder();
     dRam->setFarbe(f);
     unlockDrawable();
     rend = 1;
@@ -1283,7 +1283,7 @@ void LDiag::setDatenHintergrundFarbe(
     rend = 1;
 }
 
-void LDiag::setDatenHintergrundBildZ(Bild* b)
+void LDiag::setDatenHintergrundImageZ(Image* b)
 {
     lockDrawable();
     if (dBgB) dBgB->release();
@@ -1292,12 +1292,12 @@ void LDiag::setDatenHintergrundBildZ(Bild* b)
     rend = 1;
 }
 
-void LDiag::setDatenHintergrundBild(Bild* b)
+void LDiag::setDatenHintergrundImage(Image* b)
 {
     lockDrawable();
-    if (!dBgB) dBgB = new Bild();
-    dBgB->neuBild(b->getBreite(), b->getHeight(), 0);
-    dBgB->drawBild(0, 0, b->getBreite(), b->getHeight(), *b);
+    if (!dBgB) dBgB = new Image();
+    dBgB->neuImage(b->getBreite(), b->getHeight(), 0);
+    dBgB->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
     unlockDrawable();
     b->release();
     rend = 1;
@@ -1342,7 +1342,7 @@ void LDiag::setDatenAlphaFeldStrength(int st)
     unlockDrawable();
 }
 
-void LDiag::render(Bild& zRObj)
+void LDiag::render(Image& zRObj)
 {
     if (!hatDatenStyle(DiagDaten::Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
@@ -1411,7 +1411,7 @@ void LDiag::render(Bild& zRObj)
         {
             if (vIntervallRB->getBreite() != vIRBbr
                 || vIntervallRB->getHeight() != schriftGr + 2)
-                vIntervallRB->neuBild(vIRBbr, schriftGr + 2, 0xFF000000);
+                vIntervallRB->neuImage(vIRBbr, schriftGr + 2, 0xFF000000);
             else
                 vIntervallRB->fillRegion(
                     0, 0, vIRBbr, schriftGr + 2, 0xFF000000);
@@ -1496,13 +1496,13 @@ void LDiag::render(Bild& zRObj)
             }
             if (hatDatenStyle(DiagDaten::Style::HIntervall)
                 && daten->hIntervallFarbe)
-                zRObj.alphaBild90(innenSize.x - vIntervallRB->getHeight(),
+                zRObj.alphaImage90(innenSize.x - vIntervallRB->getHeight(),
                     schriftGr + 2,
                     vIntervallRB->getBreite(),
                     vIntervallRB->getHeight(),
                     *vIntervallRB);
             else
-                zRObj.alphaBild90(innenSize.x - vIntervallRB->getHeight(),
+                zRObj.alphaImage90(innenSize.x - vIntervallRB->getHeight(),
                     0,
                     vIntervallRB->getBreite(),
                     vIntervallRB->getHeight(),
@@ -1521,7 +1521,7 @@ void LDiag::render(Bild& zRObj)
         {
             if (hIntervallRB->getBreite() != hIRBbr
                 || hIntervallRB->getHeight() != schriftGr + 2)
-                hIntervallRB->neuBild(hIRBbr, schriftGr + 2, 0xFF000000);
+                hIntervallRB->neuImage(hIRBbr, schriftGr + 2, 0xFF000000);
             else
                 hIntervallRB->fillRegion(
                     0, 0, hIRBbr, schriftGr + 2, 0xFF000000);
@@ -1600,7 +1600,7 @@ void LDiag::render(Bild& zRObj)
                     *hIntervallRB,
                     daten->hIntervallFarbe);
             }
-            zRObj.alphaBild(0,
+            zRObj.alphaImage(0,
                 0,
                 hIntervallRB->getBreite(),
                 hIntervallRB->getHeight(),
@@ -1636,13 +1636,13 @@ void LDiag::render(Bild& zRObj)
             zRObj.alphaRegion(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, dBgF);
         else
             zRObj.fillRegion(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, dBgF);
-        if (hatStyle(Style::DatenHBild) && dBgB)
+        if (hatStyle(Style::DatenHImage) && dBgB)
         {
             if (hatStyle(Style::DatenHAlpha))
-                zRObj.alphaBild(
+                zRObj.alphaImage(
                     0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, *dBgB);
             else
-                zRObj.drawBild(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, *dBgB);
+                zRObj.drawImage(0, 0, dgbr - dgrbr * 2, dghi - dgrbr * 2, *dBgB);
         }
     }
     if (hatStyle(Style::DatenBuffered) && dAf)
@@ -1883,23 +1883,23 @@ void LDiag::render(Bild& zRObj)
 }
 
 // constant
-Schrift* LDiag::getSchrift() const // Returns the font
+Font* LDiag::getFont() const // Returns the font
 {
-    return textRd ? textRd->getSchrift() : 0;
+    return textRd ? textRd->getFont() : 0;
 }
 
-Schrift* LDiag::zSchrift() const
+Font* LDiag::zFont() const
 {
-    return textRd ? textRd->zSchrift() : 0;
+    return textRd ? textRd->zFont() : 0;
 }
 
-Rahmen* LDiag::getDatenRahmen()
+Border* LDiag::getDataBorder()
     const // Returns the inner border around the actual diagram
 {
-    return dRam ? dynamic_cast<Rahmen*>(dRam->getThis()) : 0;
+    return dRam ? dynamic_cast<Border*>(dRam->getThis()) : 0;
 }
 
-Rahmen* LDiag::zDatenRahmen() const
+Border* LDiag::zDataBorder() const
 {
     return dRam;
 }
@@ -1920,12 +1920,12 @@ int LDiag::getDatenHintergrundFarbe()
     return dBgF;
 }
 
-Bild* LDiag::getDatenHintergrundBild() const
+Image* LDiag::getDatenHintergrundImage() const
 {
-    return dBgB ? dynamic_cast<Bild*>(dBgB->getThis()) : 0;
+    return dBgB ? dynamic_cast<Image*>(dBgB->getThis()) : 0;
 }
 
-Bild* LDiag::zDatenHintergrundBild() const
+Image* LDiag::zDatenHintergrundImage() const
 {
     return dBgB;
 }

Diagram.h

@@ -7,10 +7,10 @@
 
 namespace Framework
 {
-    class Rahmen;     //! Border.h
+    class Border;     //! Border.h
     class AlphaFeld;  //! AlphaField.h
     class Text;       //! Text.h
-    class Schrift;    //! Font.h
+    class Font;    //! Font.h
     class HScrollBar; //! Scroll.h
     class VScrollBar; //! Scroll.h
     class SLDiag;     //! from this file
@@ -32,7 +32,7 @@ namespace Framework
             //! Combination of flags Visible, Background,
             //! Border, Grid, LineName
             static const __int64 normal
-                = Sichtbar | Hintergrund | Rahmen | Gitter | LinienName;
+                = Sichtbar | Hintergrund | Border | Gitter | LinienName;
         };
 
     private:
@@ -56,7 +56,7 @@ namespace Framework
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets a pointer to the used font
         //! \param schrift The font
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Sets the spacing between the grid lines
         //! \param gr For x the spacing between each vertical line in
         //! pixels and for y the spacing between each horizontal line in
@@ -88,11 +88,11 @@ namespace Framework
         DLLEXPORT void removeLinie(int lNum);
         //! Draws the diagram
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the used font
-        DLLEXPORT Schrift* getSchrift() const;
+        DLLEXPORT Font* getFont() const;
         //! Returns the used font without increased reference counter
-        DLLEXPORT Schrift* zSchrift() const;
+        DLLEXPORT Font* zFont() const;
         //! Returns the size of a grid square, where the width is in pixels
         //! and the height is in y axis values
         DLLEXPORT const Punkt& getGSize() const;
@@ -543,7 +543,7 @@ namespace Framework
             //! the data background
             static const __int64 DatenHAlpha = 0x04000;
             //! Determines whether an image is used for the data background
-            static const __int64 DatenHBild = 0x008000;
+            static const __int64 DatenHImage = 0x008000;
             //! Determines whether the data has a color gradient
             static const __int64 DatenBuffered = 0x010000;
 
@@ -555,12 +555,12 @@ namespace Framework
 
     private:
         TextRenderer* textRd;
-        Rahmen* dRam;
+        Border* dRam;
         int dBgF;
-        Bild* dBgB;
+        Image* dBgB;
         AlphaFeld* dAf;
-        Bild* vIntervallRB;
-        Bild* hIntervallRB;
+        Image* vIntervallRB;
+        Image* hIntervallRB;
         int schriftGr;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
@@ -576,16 +576,16 @@ namespace Framework
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the font
         //! \param schrift The font
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Sets the font size
         //! \param gr The height of a line in pixels
         DLLEXPORT void setSchriftSize(int gr);
         //! Sets the inner border around the actual diagram (border around the
         //! data) \param ram The border
-        DLLEXPORT void setDatenRahmenZ(Rahmen* ram);
+        DLLEXPORT void setDataBorderZ(Border* ram);
         //! Sets the inner border around the actual diagram (border around the
         //! data) by copying a border \param ram The border to copy
-        DLLEXPORT void setDatenRahmen(Rahmen* ram);
+        DLLEXPORT void setDataBorder(Border* ram);
         //! Sets the width of the inner border around the actual diagram
         //! (border around the data) \param br The width in pixels
         DLLEXPORT void setDatenRahmenBreite(int br);
@@ -594,8 +594,8 @@ namespace Framework
         DLLEXPORT void setDatenRahmenFarbe(int fc);
         //! Sets the background of the actual diagram
         DLLEXPORT void setDatenHintergrundFarbe(int fc);
-        DLLEXPORT void setDatenHintergrundBildZ(Bild* b);
-        DLLEXPORT void setDatenHintergrundBild(Bild* b);
+        DLLEXPORT void setDatenHintergrundImageZ(Image* b);
+        DLLEXPORT void setDatenHintergrundImage(Image* b);
         //! Sets the color gradient of the actual diagram (color gradient of
         //! the data) \param af The color gradient
         DLLEXPORT void setDatenAlphaFeldZ(AlphaFeld* af);
@@ -611,17 +611,17 @@ namespace Framework
         DLLEXPORT void setDatenAlphaFeldStrength(int st);
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the font
-        DLLEXPORT Schrift* getSchrift() const;
+        DLLEXPORT Font* getFont() const;
         //! Returns the font without increased reference counter
-        DLLEXPORT Schrift* zSchrift() const;
+        DLLEXPORT Font* zFont() const;
         //! Returns the inner border around the actual diagram (border around
         //! the data)
-        DLLEXPORT Rahmen* getDatenRahmen() const;
+        DLLEXPORT Border* getDataBorder() const;
         //! Returns the inner border around the actual diagram without increased
         //! reference counter (border around the data)
-        DLLEXPORT Rahmen* zDatenRahmen() const;
+        DLLEXPORT Border* zDataBorder() const;
         //! Returns the color of the inner border around the actual diagram in
         //! A8R8G8B8 format (border around the data)
         DLLEXPORT int getDatenRahmenFarbe() const;
@@ -633,10 +633,10 @@ namespace Framework
         DLLEXPORT int getDatenHintergrundFarbe() const;
         //! Returns the background image of the actual diagram
         //! (background image of the data)
-        DLLEXPORT Bild* getDatenHintergrundBild() const;
+        DLLEXPORT Image* getDatenHintergrundImage() const;
         //! Returns the background image of the actual diagram without increased
         //! reference counter (background image of the data)
-        DLLEXPORT Bild* zDatenHintergrundBild() const;
+        DLLEXPORT Image* zDatenHintergrundImage() const;
         //! Returns the color gradient of the actual diagram
         //! (color gradient of the data)
         DLLEXPORT AlphaFeld* getDatenAlphaFeld() const;

Dialog.cpp

@@ -33,36 +33,36 @@ void MultiplChoiceDialog::addChoice(const char* text, void* id)
 }
 
 // shows the dialog and waits for user input
-void* MultiplChoiceDialog::anzeigen(Schrift* zSchrift)
+void* MultiplChoiceDialog::anzeigen(Font* zFont)
 {
     void* result = 0;
     bool ex = 0;
 
     WNDCLASS wc = F_Normal(0);
     wc.lpszClassName = "Dialog";
-    WFenster* f = new WFenster();
+    NativeWindow* f = new NativeWindow();
     f->setVSchliessAktion([&ex](void* p, void* o) { ex = true; });
     f->setMausAktion(_ret1ME);
     f->setTastaturAktion(_ret1TE);
     f->erstellen(WS_OVERLAPPEDWINDOW, wc);
     f->setSize(200, 200);
-    f->setPosition(Bildschirmmitte(dynamic_cast<WFenster*>(f->getThis())));
+    f->setPosition(ScreenCenter(dynamic_cast<NativeWindow*>(f->getThis())));
     f->setVerschiebbar(1);
     f->setAnzeigeModus(1);
-    Bildschirm* b = new Bildschirm2D(dynamic_cast<WFenster*>(f->getThis()));
-    f->setBildschirm(dynamic_cast<Bildschirm*>(b->getThis()));
+    Screen* b = new Screen2D(dynamic_cast<NativeWindow*>(f->getThis()));
+    f->setScreen(dynamic_cast<Screen*>(b->getThis()));
     b->update();
 
     RenderTh* r = new RenderTh();
-    r->setBildschirm(dynamic_cast<Bildschirm*>(b->getThis()));
+    r->setScreen(dynamic_cast<Screen*>(b->getThis()));
     r->beginn();
 
     AuswahlBox* ab = new AuswahlBox();
     ab->setPosition(10, 10);
     ab->setSize(180, 20);
     ab->setHintergrundFarbe(0xFF000000);
-    ab->setRahmenBreite(1);
-    ab->setRahmenFarbe(0xFFFFFFFF);
+    ab->setBorderWidth(1);
+    ab->setBorderColor(0xFFFFFFFF);
     ab->setMaxAuskappHeight(120);
     ab->setMausRahmenBreite(1);
     ab->setMausRahmenFarbe(0xFF005500);
@@ -73,7 +73,7 @@ void* MultiplChoiceDialog::anzeigen(Schrift* zSchrift)
     ab->setAuswAlphaFeldFarbe(0x0000FF00);
     ab->setAuswAlphaFeldStrength(-8);
     ab->setStyle(AuswahlBox::Style::Normal);
-    ab->setSchriftZ(dynamic_cast<Schrift*>(zSchrift->getThis()));
+    ab->setFontZ(dynamic_cast<Font*>(zFont->getThis()));
     for (Text* i : *entrys)
         ab->addEintrag(i->getText());
     ab->setMausEreignis(_ret1ME);
@@ -83,7 +83,7 @@ void* MultiplChoiceDialog::anzeigen(Schrift* zSchrift)
     ok->setStyle(Knopf::Style::Normal);
     ok->setPosition(50, 150);
     ok->setSize(100, 20);
-    ok->setSchriftZ(dynamic_cast<Schrift*>(zSchrift->getThis()));
+    ok->setFontZ(dynamic_cast<Font*>(zFont->getThis()));
     ok->setText("Ok");
     ok->setMausEreignis(
         [this, &ex, &result, ab](void* p, void* o, MausEreignis me) {
@@ -110,7 +110,7 @@ void* MultiplChoiceDialog::anzeigen(Schrift* zSchrift)
     r->release();
 
     b->release();
-    f->setBildschirm(0);
+    f->setScreen(0);
     f->setAnzeigeModus(0);
     f->zerstoeren();
     f->release();

Dialog.h

@@ -6,7 +6,7 @@
 namespace Framework
 {
     class Text;
-    class Schrift;
+    class Font;
 
     class MultiplChoiceDialog : public virtual ReferenceCounter
     {
@@ -20,6 +20,6 @@ namespace Framework
         //! Adds a selection option
         DLLEXPORT void addChoice(const char* text, void* id);
         //! Shows the dialog and waits for user input
-        DLLEXPORT void* anzeigen(Schrift* zSchrift);
+        DLLEXPORT void* anzeigen(Font* zFont);
     };
 } // namespace Framework

Drawing.cpp

@@ -59,7 +59,7 @@ void Drawable::setRender()
 }
 
 void Drawable::setToolTipText(
-    const char* txt, Bildschirm* zScreen, Schrift* zSchrift)
+    const char* txt, Screen* zScreen, Font* zFont)
 {
     if (!txt)
         toolTip = (ToolTip*)toolTip->release();
@@ -70,15 +70,15 @@ void Drawable::setToolTipText(
             toolTip = new ToolTip(zScreen);
             toolTip->addStyle(DrawableBackground::Style::Hintergrund
                               | DrawableBackground::Style::HAlpha
-                              | DrawableBackground::Style::Rahmen
+                              | DrawableBackground::Style::Border
                               | DrawableBackground::Style::Sichtbar);
             toolTip->setHintergrundFarbe(0xA0000000);
-            toolTip->setRahmenFarbe(0xFFFFFFFF);
-            toolTip->setRahmenBreite(1);
+            toolTip->setBorderColor(0xFFFFFFFF);
+            toolTip->setBorderWidth(1);
             if (mausIn && toolTip) toolTip->setMausIn(1);
         }
-        UIInit init = defaultUI(zSchrift, zScreen);
-        TextFeld* t = init.createTextFeld(init.initParam);
+        UIInit init = defaultUI(zFont, zScreen);
+        TextField* t = init.createTextField(init.initParam);
         t->setText(txt);
         t->setSize(t->zTextRenderer()->getTextBreite(txt),
             t->zTextRenderer()->getTextHeight(txt));
@@ -390,7 +390,7 @@ void Drawable::removeStyle(__int64 style)
     }
 }
 
-void Drawable::render(Bild& zRObj)
+void Drawable::render(Image& zRObj)
 {
     if (toolTip && (style | Style::Sichtbar) == style) toolTip->setZeichnen();
 }
@@ -511,7 +511,7 @@ DrawableBackground::DrawableBackground()
 {
     hintergrundFarbe = 0xFF000000;
     rahmen = 0;
-    hintergrundBild = 0;
+    hintergrundImage = 0;
     hintergrundFeld = 0;
     horizontalScrollBar = 0;
     vertikalScrollBar = 0;
@@ -525,7 +525,7 @@ DrawableBackground::DrawableBackground()
 DrawableBackground::~DrawableBackground()
 {
     if (rahmen) rahmen->release();
-    if (hintergrundBild) hintergrundBild->release();
+    if (hintergrundImage) hintergrundImage->release();
     if (hintergrundFeld) hintergrundFeld->release();
     if (horizontalScrollBar) horizontalScrollBar->release();
     if (vertikalScrollBar) vertikalScrollBar->release();
@@ -536,7 +536,7 @@ void DrawableBackground::doMausEreignis(MausEreignis& me, bool userRet)
     if (userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
         bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
@@ -554,12 +554,12 @@ void DrawableBackground::doMausEreignis(MausEreignis& me, bool userRet)
     me.verarbeitet = userRet;
 }
 
-void DrawableBackground::setHintergrundBild(
-    Bild* bild) // sets the background image
+void DrawableBackground::setHintergrundImage(
+    Image* bild) // sets the background image
 {
-    if (!hintergrundBild) hintergrundBild = new Bild();
-    hintergrundBild->neuBild(bild->getBreite(), bild->getHeight(), 0);
-    int* buff1 = hintergrundBild->getBuffer();
+    if (!hintergrundImage) hintergrundImage = new Image();
+    hintergrundImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    int* buff1 = hintergrundImage->getBuffer();
     int* buff2 = bild->getBuffer();
     for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
@@ -567,13 +567,13 @@ void DrawableBackground::setHintergrundBild(
     rend = 1;
 }
 
-void DrawableBackground::setHintergrundBildZ(
-    Bild* bild) // sets a pointer to the background image
+void DrawableBackground::setHintergrundImageZ(
+    Image* bild) // sets a pointer to the background image
 {
-    if (hintergrundBild != bild)
+    if (hintergrundImage != bild)
     {
-        if (hintergrundBild) hintergrundBild->release();
-        hintergrundBild = bild;
+        if (hintergrundImage) hintergrundImage->release();
+        hintergrundImage = bild;
         rend = 1;
     }
 }
@@ -629,8 +629,8 @@ void DrawableBackground::setAlphaFeldFarbe(
     }
 }
 
-void DrawableBackground::setRahmenZ(
-    Rahmen* ram) // sets a pointer to the border
+void DrawableBackground::setBorderZ(
+    Border* ram) // sets a pointer to the border
 {
     if (rahmen != ram)
     {
@@ -640,11 +640,11 @@ void DrawableBackground::setRahmenZ(
     }
 }
 
-void DrawableBackground::setRahmenBreite(int br) // sets the border width
+void DrawableBackground::setBorderWidth(int br) // sets the border width
 {
     if (!rahmen)
     {
-        rahmen = new LRahmen();
+        rahmen = new LBorder();
         rend = 1;
     }
     if (rahmen->getRBreite() != br)
@@ -654,11 +654,11 @@ void DrawableBackground::setRahmenBreite(int br) // sets the border width
     }
 }
 
-void DrawableBackground::setRahmenFarbe(int fc) // sets the border color
+void DrawableBackground::setBorderColor(int fc) // sets the border color
 {
     if (!rahmen)
     {
-        rahmen = new LRahmen();
+        rahmen = new LBorder();
         rend = 1;
     }
     if (rahmen->getFarbe() != fc)
@@ -773,7 +773,7 @@ bool DrawableBackground::tick(double tickVal)
     return Drawable::tick(tickVal);
 }
 
-void DrawableBackground::render(Bild& rObj)
+void DrawableBackground::render(Image& rObj)
 {
     innenPosition.x = pos.x;
     innenPosition.y = pos.y;
@@ -788,7 +788,7 @@ void DrawableBackground::render(Bild& rObj)
     }
     Drawable::render(rObj);
     int rbr = 0;
-    if (hatStyle(Style::Rahmen) && rahmen)
+    if (hatStyle(Style::Border) && rahmen)
     {
         rahmen->setSize(gr);
         rahmen->render(rObj);
@@ -861,27 +861,27 @@ void DrawableBackground::render(Bild& rObj)
         else
             rObj.fillRegion(
                 0, 0, gr.x - rbr * 2, gr.y - rbr * 2, hintergrundFarbe);
-        if (hatStyle(Style::HBild) && hintergrundBild)
+        if (hatStyle(Style::HImage) && hintergrundImage)
         {
-            if (hatStyle(Style::HBildScale))
+            if (hatStyle(Style::HImageScale))
             {
                 if (hatStyle(Style::HAlpha))
-                    rObj.alphaBildSkall(
-                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundBild);
+                    rObj.alphaImageSkall(
+                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
                 else
-                    rObj.drawBildSkall(
-                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundBild);
+                    rObj.drawImageSkall(
+                        0, 0, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
             }
             else
             {
-                int x = (gr.x - rbr * 2 - hintergrundBild->getSize().x) / 2;
-                int y = (gr.y - rbr * 2 - hintergrundBild->getSize().y) / 2;
+                int x = (gr.x - rbr * 2 - hintergrundImage->getSize().x) / 2;
+                int y = (gr.y - rbr * 2 - hintergrundImage->getSize().y) / 2;
                 if (hatStyle(Style::HAlpha))
-                    rObj.alphaBild(
-                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundBild);
+                    rObj.alphaImage(
+                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
                 else
-                    rObj.drawBild(
-                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundBild);
+                    rObj.drawImage(
+                        x, y, gr.x - rbr * 2, gr.y - rbr * 2, *hintergrundImage);
             }
         }
     }
@@ -899,26 +899,26 @@ void DrawableBackground::render(Bild& rObj)
 // Returns the width of the interior area of the drawing in pixels
 int DrawableBackground::getInnenBreite() const
 {
-    return getBreite() - 2 * getRahmenBreite();
+    return getBreite() - 2 * getBorderWidth();
 }
 
 // Returns the height of the interior area of the drawing in pixels
 int DrawableBackground::getInnenHeight() const
 {
-    return getHeight() - 2 * getRahmenBreite();
+    return getHeight() - 2 * getBorderWidth();
 }
 
-Bild* DrawableBackground::getHintergrundBild()
+Image* DrawableBackground::getHintergrundImage()
     const // returns the background image
 {
-    if (!hintergrundBild) return 0;
-    return dynamic_cast<Bild*>(hintergrundBild->getThis());
+    if (!hintergrundImage) return 0;
+    return dynamic_cast<Image*>(hintergrundImage->getThis());
 }
 
-Bild* DrawableBackground::zHintergrundBild()
+Image* DrawableBackground::zHintergrundImage()
     const // returns the background image without increased reference counter
 {
-    return hintergrundBild;
+    return hintergrundImage;
 }
 
 int DrawableBackground::getHintergrundFarbe()
@@ -953,25 +953,25 @@ int DrawableBackground::getAlphaFeldFarbe()
     return hintergrundFeld->getFarbe();
 }
 
-Rahmen* DrawableBackground::getRahmen() const // returns the border
+Border* DrawableBackground::getBorder() const // returns the border
 {
     if (!rahmen) return 0;
-    return dynamic_cast<Rahmen*>(rahmen->getThis());
+    return dynamic_cast<Border*>(rahmen->getThis());
 }
 
-Rahmen* DrawableBackground::zRahmen()
+Border* DrawableBackground::zBorder()
     const // returns the border without increased reference counter
 {
     return rahmen;
 }
 
-int DrawableBackground::getRahmenBreite() const // returns the border width
+int DrawableBackground::getBorderWidth() const // returns the border width
 {
-    if (!rahmen || hatStyleNicht(Style::Rahmen)) return 0;
+    if (!rahmen || hatStyleNicht(Style::Border)) return 0;
     return rahmen->getRBreite();
 }
 
-int DrawableBackground::getRahmenFarbe() const // returns the border color
+int DrawableBackground::getBorderColor() const // returns the border color
 {
     return rahmen->getFarbe();
 }
@@ -1031,10 +1031,10 @@ DrawableBackground::dublizieren() const // Creates a copy of the drawing
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (vertikalScrollBar)
     {
         obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());

Drawing.h

@@ -13,15 +13,15 @@ namespace Framework
 {
     struct MausEreignis;     //! MouseEvent.h
     struct TastaturEreignis; //! KeyboardEvent.h
-    class Bild;              //! Image.h
+    class Image;              //! Image.h
     class Drawable;         //! From this file
     class ToolTip;           //! ToolTip.h
-    class Bildschirm;        //! Screen.h
-    class Rahmen;            //! Border.h
+    class Screen;        //! Screen.h
+    class Border;            //! Border.h
     class AlphaFeld;         //! AlphaField.h
     class VScrollBar;        //! Scroll.h
     class HScrollBar;        //! Scroll.h
-    class Schrift;
+    class Font;
 
     //! A drawing element for the 2D GUI Framework
     class Drawable : public virtual ReferenceCounter
@@ -88,10 +88,10 @@ namespace Framework
         //! Sets the text that appears when the user hovers the mouse over
         //! the drawing for a longer time \param txt The text to display
         //! \param zScreen A pointer to the screen object without increased
-        //! reference counter \param zSchrift A pointer to the font to use
+        //! reference counter \param zFont A pointer to the font to use
         //! without increased reference counter
         DLLEXPORT void setToolTipText(
-            const char* txt, Bildschirm* zScreen, Schrift* zSchrift);
+            const char* txt, Screen* zScreen, Font* zFont);
         //! Sets a function called when a tooltip is needed and none has
         //! been set yet \param initToolTip The function
         DLLEXPORT void setNeedToolTipEvent(
@@ -216,7 +216,7 @@ namespace Framework
         DLLEXPORT void removeStyle(__int64 style);
         //! Renders the drawing into a specific image
         //! \param zRObj The image to draw into
-        DLLEXPORT virtual void render(Bild& zRObj);
+        DLLEXPORT virtual void render(Image& zRObj);
         //! Returns whether a callback function for mouse events was set
         DLLEXPORT bool hatMausEreignis() const;
         //! Returns whether a callback function for keyboard events was set
@@ -276,7 +276,7 @@ namespace Framework
         {
         public:
             //! If this flag is set, the drawing gets a border
-            static const __int64 Rahmen = 0x00010;
+            static const __int64 Border = 0x00010;
             //! If this flag is set, the drawing gets a background
             static const __int64 Hintergrund = 0x00020;
             //! If this flag is set, the background is transparent.
@@ -284,7 +284,7 @@ namespace Framework
             static const __int64 HAlpha = 0x00040;
             //! If this flag is set, an image is used as background.
             //! Requires flag Hintergrund
-            static const __int64 HBild = 0x00080;
+            static const __int64 HImage = 0x00080;
             //! If this flag is set, a color gradient appears as border
             static const __int64 Buffered = 0x00100;
             //! If this flag is set, a scrollbar appears at the right edge
@@ -292,13 +292,13 @@ namespace Framework
             //! If this flag is set, a scrollbar appears at the bottom edge
             static const __int64 HScroll = 0x00400;
             //! If this flag is set, the image is scaled
-            static const __int64 HBildScale = 0x00800;
+            static const __int64 HImageScale = 0x00800;
         };
 
     protected:
         int hintergrundFarbe;
-        Rahmen* rahmen;
-        Bild* hintergrundBild;
+        Border* rahmen;
+        Image* hintergrundImage;
         AlphaFeld* hintergrundFeld;
         VScrollBar* vertikalScrollBar;
         HScrollBar* horizontalScrollBar;
@@ -316,12 +316,12 @@ namespace Framework
         //! Destructor
         DLLEXPORT virtual ~DrawableBackground();
         //! Sets the background image (requires drawing flag:
-        //! Style::Hintergrund, HBild) \param bild The image is copied and used
+        //! Style::Hintergrund, HImage) \param bild The image is copied and used
         //! as background image
-        DLLEXPORT void setHintergrundBild(Bild* bild);
+        DLLEXPORT void setHintergrundImage(Image* bild);
         //! Sets a pointer to the background image (requires drawing flag:
         //! Style::Hintergrund) \param bild The image is used without copying
-        DLLEXPORT void setHintergrundBildZ(Bild* bild);
+        DLLEXPORT void setHintergrundImageZ(Image* bild);
         //! Sets the background color (requires drawing flag:
         //! Style::Hintergrund) \param fc The background color in A8R8G8B8 format
         DLLEXPORT void setHintergrundFarbe(int fc);
@@ -337,15 +337,15 @@ namespace Framework
         //! over the background
         DLLEXPORT void setAlphaFeldFarbe(int fc);
         //! Sets a pointer to the line border drawn around the text field
-        //! (requires drawing flag: Style::Rahmen)
+        //! (requires drawing flag: Style::Border)
         //! \param ram The border
-        DLLEXPORT void setRahmenZ(Rahmen* ram);
+        DLLEXPORT void setBorderZ(Border* ram);
         //! Sets the width of the line border (requires drawing flag:
-        //! Style::Rahmen) \param br The width in pixels
-        DLLEXPORT void setRahmenBreite(int br);
+        //! Style::Border) \param br The width in pixels
+        DLLEXPORT void setBorderWidth(int br);
         //! Sets the color of the line border (requires drawing flag:
-        //! Style::Rahmen) \param fc The color in A8R8G8B8 format
-        DLLEXPORT void setRahmenFarbe(int fc);
+        //! Style::Border) \param fc The color in A8R8G8B8 format
+        DLLEXPORT void setBorderColor(int fc);
         //! Sets the scroll speed of the vertical scroll bar (requires drawing
         //! flag: Style::VScroll) \param ks The scroll speed in pixels per mouse click
         DLLEXPORT void setVertikalKlickScroll(int ks);
@@ -371,7 +371,7 @@ namespace Framework
         //! of this function \return 1 if the image needs to be redrawn. 0 otherwise
         DLLEXPORT bool tick(double tickVal) override;
         //! Renders the background of a drawing to rObj
-        DLLEXPORT void render(Bild& rObj) override;
+        DLLEXPORT void render(Image& rObj) override;
 
         //! Returns the inner width of the drawing in pixels
         DLLEXPORT virtual int getInnenBreite() const override;
@@ -379,10 +379,10 @@ namespace Framework
         DLLEXPORT virtual int getInnenHeight() const override;
         //! Returns the background image.
         //! \return 0 if no background image is used
-        DLLEXPORT Bild* getHintergrundBild() const;
+        DLLEXPORT Image* getHintergrundImage() const;
         //! Returns the background image without increased reference counter.
         //! \return 0 if no background image is used
-        DLLEXPORT Bild* zHintergrundBild() const;
+        DLLEXPORT Image* zHintergrundImage() const;
         //! Returns the background color in A8R8G8B8 format
         DLLEXPORT int getHintergrundFarbe() const;
         //! Returns the AlphaFeld drawn over the background.
@@ -397,14 +397,14 @@ namespace Framework
         DLLEXPORT int getAlphaFeldFarbe() const;
         //! Returns the border
         //! \return 0 if no border was defined
-        DLLEXPORT Rahmen* getRahmen() const;
+        DLLEXPORT Border* getBorder() const;
         //! Returns the border without increased reference counter
         //! \return 0 if no border was defined
-        DLLEXPORT Rahmen* zRahmen() const;
+        DLLEXPORT Border* zBorder() const;
         //! Returns the width of the border in pixels
-        DLLEXPORT int getRahmenBreite() const;
+        DLLEXPORT int getBorderWidth() const;
         //! Returns the color of the border in A8R8G8B8 format
-        DLLEXPORT int getRahmenFarbe() const;
+        DLLEXPORT int getBorderColor() const;
         //! Returns the scroll speed of the vertical scroll bar
         DLLEXPORT int getVertikalKlickScroll() const;
         //! Returns the scroll position of the vertical scroll bar

Drawing3D.h

@@ -9,7 +9,7 @@ namespace Framework
     struct TastaturEreignis;
     class Render3D; //! Render3D.h
 
-    //! An object that can be drawn by the Bildschirm3D class.
+    //! An object that can be drawn by the Screen3D class.
     class Drawable3D : public virtual ReferenceCounter
     {
     protected:

FileSystem.cpp

@@ -524,7 +524,7 @@ LTDBDateiKopf::~LTDBDateiKopf()
 }
 
 // non-constant
-void LTDBDateiKopf::removeBild(int i)
+void LTDBDateiKopf::removeImage(int i)
 {
     if (i >= bAnzahl) return;
     bilder->remove(i);
@@ -532,7 +532,7 @@ void LTDBDateiKopf::removeBild(int i)
     --bAnzahl;
 }
 
-void LTDBDateiKopf::removeBild(Text* txt)
+void LTDBDateiKopf::removeImage(Text* txt)
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -551,19 +551,19 @@ void LTDBDateiKopf::removeBild(Text* txt)
     --bAnzahl;
 }
 
-void LTDBDateiKopf::addBild(Text* txt)
+void LTDBDateiKopf::addImage(Text* txt)
 {
     bilder->add(txt, bAnzahl);
     pos->add(0, bAnzahl);
     ++bAnzahl;
 }
 
-void LTDBDateiKopf::setBildPos(int i, __int64 pos)
+void LTDBDateiKopf::setImagePos(int i, __int64 pos)
 {
     this->pos->set(pos, i);
 }
 
-void LTDBDateiKopf::setBildPos(Text* txt, __int64 pos)
+void LTDBDateiKopf::setImagePos(Text* txt, __int64 pos)
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -649,17 +649,17 @@ void LTDBDateiKopf::speichern(std::ofstream* outF) const
     }
 }
 
-Text* LTDBDateiKopf::getBild(int i) const
+Text* LTDBDateiKopf::getImage(int i) const
 {
     return bilder->get(i);
 }
 
-Text* LTDBDateiKopf::zBild(int i) const
+Text* LTDBDateiKopf::zImage(int i) const
 {
     return bilder->z(i);
 }
 
-__int64 LTDBDateiKopf::getBildPosition(Text* txt) const
+__int64 LTDBDateiKopf::getImagePosition(Text* txt) const
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -676,12 +676,12 @@ __int64 LTDBDateiKopf::getBildPosition(Text* txt) const
     return pos->get(i);
 }
 
-__int64 LTDBDateiKopf::getBildPosition(int index) const
+__int64 LTDBDateiKopf::getImagePosition(int index) const
 {
     return pos->get(index);
 }
 
-int LTDBDateiKopf::getBildIndex(Text* txt) const
+int LTDBDateiKopf::getImageIndex(Text* txt) const
 {
     int i = -1;
     for (int ii = 0; ii < bAnzahl; ++ii)
@@ -702,7 +702,7 @@ int LTDBDateiKopf::getbAnzahl() const
     return bAnzahl;
 }
 
-RCArray<Text>* LTDBDateiKopf::zBildListe() const
+RCArray<Text>* LTDBDateiKopf::zImageListe() const
 {
     return bilder;
 }
@@ -1038,13 +1038,13 @@ int ende) const // returns the bits from begin to ende (excluding ende)
 LTDBBody::LTDBBody()
     : ReferenceCounter(),
       gr(0, 0),
-      b(new Bild())
+      b(new Image())
 {}
 
 LTDBBody::LTDBBody(LTDBKopf* k) // calls init
     : ReferenceCounter(),
       gr(0, 0),
-      b(new Bild())
+      b(new Image())
 {
     init(k);
 }
@@ -1075,7 +1075,7 @@ void LTDBBody::init(LTDBKopf* k) // Initializes, required before loading
 
 void LTDBBody::laden(FBalken* zF, std::ifstream* inF) // loads the image
 {
-    b->neuBild(gr.x, gr.y, 0xFF000000); // create new image
+    b->neuImage(gr.x, gr.y, 0xFF000000); // create new image
     int* buff = b->getBuffer();
     int breite = b->getBreite();
     char byte = 0;
@@ -1115,7 +1115,7 @@ void LTDBBody::laden(FBalken* zF, std::ifstream* inF) // loads the image
     if (davor) davor = (LTDBPixel*)davor->release();
 }
 
-void LTDBBody::setBild(Bild* b) // sets the image to be saved
+void LTDBBody::setImage(Image* b) // sets the image to be saved
 {
     this->b->release();
     this->b = b;
@@ -1181,9 +1181,9 @@ void LTDBBody::speichern(
     }
 }
 
-Bild* LTDBBody::getBild() const // returns the loaded image
+Image* LTDBBody::getImage() const // returns the loaded image
 {
-    return dynamic_cast<Bild*>(b->getThis());
+    return dynamic_cast<Image*>(b->getThis());
 }
 
 const Punkt& LTDBBody::getSize() const // returns the size of the image
@@ -1260,7 +1260,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
             name->release();
             return;
         }
-        int index = datKpf->getBildIndex(dynamic_cast<Text*>(name->getThis()));
+        int index = datKpf->getImageIndex(dynamic_cast<Text*>(name->getThis()));
         if (index == -1) // the image does not exist
         {
             name->release();
@@ -1289,8 +1289,8 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
             pf_tmp->getText(), std::ios::binary); // open new file
         if (inF->is_open() && outF->is_open())
         {
-            __int64 position = datKpf->getBildPosition(index);
-            datKpf->removeBild(index);
+            __int64 position = datKpf->getImagePosition(index);
+            datKpf->removeImage(index);
             datKpf->speichern(outF);
             LTDBDateiKopf* kpf_tmp = new LTDBDateiKopf();
             kpf_tmp->laden(0, inF);
@@ -1298,7 +1298,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
             char byte = 0;
             __int64 pos_minus = inF->tellg() - outF->tellp();
             for (int i = 0; i < index; ++i)
-                datKpf->setBildPos(i, datKpf->getBildPosition(i) - pos_minus);
+                datKpf->setImagePos(i, datKpf->getImagePosition(i) - pos_minus);
             // Copy bytes up to the file
             for (__int64 i = inF->tellg(); i < position; ++i)
             {
@@ -1319,7 +1319,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
                 outF->write(&byte, 1);
             }
             for (int i = index; i < datKpf->getbAnzahl(); ++i)
-                datKpf->setBildPos(i, datKpf->getBildPosition(i) - pos_minus);
+                datKpf->setImagePos(i, datKpf->getImagePosition(i) - pos_minus);
             outF->seekp(0, std::ios::beg);
             datKpf->speichern(outF);
             inF->close();
@@ -1335,7 +1335,7 @@ void LTDBDatei::remove(FBalken* f, Text* name) // Deletes an image from the file
     if (name) name = (Text*)name->release();
 }
 
-Bild* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
+Image* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
 {
     if (name)
     {
@@ -1347,7 +1347,7 @@ Bild* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
         if (!datKpf) leseDaten(0);
         LTDBKopf* k_tmp = new LTDBKopf();
         k_tmp->Init(dynamic_cast<Text*>(name->getThis()), Punkt(0, 0));
-        int index = datKpf->getBildIndex(k_tmp->getTitel());
+        int index = datKpf->getImageIndex(k_tmp->getTitel());
         k_tmp->release();
         if (index == -1)
         { // Error message
@@ -1363,7 +1363,7 @@ Bild* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
         std::ifstream* inF
             = new std::ifstream(pfad->getText(), std::ios::binary);
         // Determine start of the file to load
-        __int64 position = datKpf->getBildPosition(index);
+        __int64 position = datKpf->getImagePosition(index);
         inF->seekg(position, std::ios::beg);
         LTDBKopf* kpf = new LTDBKopf();
         kpf->laden(inF);
@@ -1386,7 +1386,7 @@ Bild* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
         t->release();
         LTDBBody* kpr = new LTDBBody(dynamic_cast<LTDBKopf*>(kpf->getThis()));
         kpr->laden(f, inF); // load image
-        Bild* ret = kpr->getBild();
+        Image* ret = kpr->getImage();
         kpr->release();
         kpf->release();
         inF->close();
@@ -1398,7 +1398,7 @@ Bild* LTDBDatei::laden(FBalken* f, Text* name) // Loads an image from the file
 }
 
 int LTDBDatei::speichern(
-FBalken* f, Bild* bild, Text* name) // Saves an image to the file
+FBalken* f, Image* bild, Text* name) // Saves an image to the file
 {
     int warn = -1;
     if (name && bild)
@@ -1407,14 +1407,14 @@ FBalken* f, Bild* bild, Text* name) // Saves an image to the file
         {
             if (!datKpf) leseDaten(0);
             int index
-                = datKpf->getBildIndex(dynamic_cast<Text*>(name->getThis()));
+                = datKpf->getImageIndex(dynamic_cast<Text*>(name->getThis()));
             if (index == -1)
             {
                 warn = 0;
                 LTDBKopf* kpf = new LTDBKopf();
                 warn = kpf->Init(
                     dynamic_cast<Text*>(name->getThis()), bild->getSize());
-                if (datKpf->getBildIndex(kpf->getTitel()) != -1)
+                if (datKpf->getImageIndex(kpf->getTitel()) != -1)
                 {
                     Logging::error()
                         << "An image with this name already exists!\n";
@@ -1445,17 +1445,17 @@ FBalken* f, Bild* bild, Text* name) // Saves an image to the file
                 inF->seekg(0, std::ios::beg);
                 std::ofstream* outF
                     = new std::ofstream(pf_tmp->getText(), std::ios::binary);
-                datKpf->addBild(kpf->getTitel());
-                index = datKpf->getBildIndex(kpf->getTitel());
+                datKpf->addImage(kpf->getTitel());
+                index = datKpf->getImageIndex(kpf->getTitel());
                 datKpf->speichern(outF);
                 LTDBDateiKopf* kpf_tmp = new LTDBDateiKopf();
                 kpf_tmp->laden(0, inF);
                 kpf_tmp->release();
                 __int64 pos_plus = outF->tellp() - inF->tellg();
                 for (int i = 0; i < index; ++i)
-                    datKpf->setBildPos(
-                        i, datKpf->getBildPosition(i) + pos_plus);
-                datKpf->setBildPos(index, datLen + pos_plus);
+                    datKpf->setImagePos(
+                        i, datKpf->getImagePosition(i) + pos_plus);
+                datKpf->setImagePos(index, datLen + pos_plus);
                 outF->seekp(0, std::ios::beg);
                 datKpf->speichern(outF);
                 char byte = 0;
@@ -1467,7 +1467,7 @@ FBalken* f, Bild* bild, Text* name) // Saves an image to the file
                 kpf->speichern(outF); // save image header
                 LTDBBody* kpr
                     = new LTDBBody(dynamic_cast<LTDBKopf*>(kpf->getThis()));
-                kpr->setBild(dynamic_cast<Bild*>(bild->getThis()));
+                kpr->setImage(dynamic_cast<Image*>(bild->getThis()));
                 kpr->speichern(f, outF); // save image
                 kpf->release();
                 kpr->release();
@@ -1486,10 +1486,10 @@ FBalken* f, Bild* bild, Text* name) // Saves an image to the file
     return warn;
 }
 
-RCArray<Text>* LTDBDatei::zBildListe() // Lists all images in the file
+RCArray<Text>* LTDBDatei::zImageListe() // Lists all images in the file
 {
     if (!datKpf) leseDaten(0);
-    if (datKpf) return datKpf->zBildListe();
+    if (datKpf) return datKpf->zImageListe();
     return 0;
 }
 
@@ -1499,7 +1499,7 @@ Text* LTDBDatei::getPfad() const // Returns the path to the file
     return dynamic_cast<Text*>(pfad->getThis());
 }
 
-int LTDBDatei::getBildAnzahl() const
+int LTDBDatei::getImageAnzahl() const
 {
     if (!datKpf) return 0;
     return datKpf->getbAnzahl();
@@ -2918,8 +2918,8 @@ void LTDSDatei::erstelleDatei() // creates the file
     delete outF;
 }
 
-void LTDSDatei::speicherSchrift(
-Schrift* schrift) // Saves the provided font
+void LTDSDatei::saveFont(
+Font* schrift) // Saves the provided font
 {
     if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis())))
     {
@@ -2983,11 +2983,11 @@ Schrift* schrift) // Saves the provided font
 }
 
 // constant
-Schrift* LTDSDatei::ladeSchrift() // returns the loaded font
+Font* LTDSDatei::loadFont() // returns the loaded font
 {
     if (!DateiExistiert(dynamic_cast<Text*>(pfad->getThis()))) return 0;
     if (!dateiKopf) return 0;
-    Schrift* ret = new Schrift();
+    Font* ret = new Font();
     std::ifstream* inF = new std::ifstream(pfad->getText(), std::ios::binary);
     inF->seekg(dateiKopf->getPositionList()[0], std::ios::beg);
     for (int i = 0; i < dateiKopf->getSchriftGroesseAnzahl(); ++i)

FileSystem.h

@@ -8,13 +8,13 @@
 
 namespace Framework
 {
-    class Bild;    //! Image.h
+    class Image;    //! Image.h
     class Text;    //! Text.h
     class FBalken; //! Progress.h
 #ifdef WIN32
     class Buchstabe; //! Font.h
     class Alphabet;  //! Font.h
-    class Schrift;   //! Font.h
+    class Font;   //! Font.h
 #endif
     class LTDBPixel; //! from this file
     class LTDBKopf;  //! from this file
@@ -118,21 +118,21 @@ namespace Framework
         DLLEXPORT ~LTDBDateiKopf();
         //! Removes an image from the file header
         //! \param i The index of the image to remove
-        DLLEXPORT void removeBild(int i);
+        DLLEXPORT void removeImage(int i);
         //! Removes an image from the file header
         //! \param txt The name of the image to remove
-        DLLEXPORT void removeBild(Text* txt);
+        DLLEXPORT void removeImage(Text* txt);
         //! Adds an image to the file header
         //! \param txt The name of the image
-        DLLEXPORT void addBild(Text* txt);
+        DLLEXPORT void addImage(Text* txt);
         //! Sets the byte index in the file where the image begins
         //! \param i The index of the image
         //! \param pos The position of the image in the file
-        DLLEXPORT void setBildPos(int i, __int64 pos);
+        DLLEXPORT void setImagePos(int i, __int64 pos);
         //! Sets the byte index in the file where the image begins
         //! \param txt The name of the image
         //! \param pos The position of the image in the file
-        DLLEXPORT void setBildPos(Text* txt, __int64 pos);
+        DLLEXPORT void setImagePos(Text* txt, __int64 pos);
         //! Loads the file header of an LTDB file
         //! \param f A pointer to a progress bar to use for loading. Can be 0.
         //! \param inF The opened ifstream of the LTDB file with the read
@@ -145,28 +145,28 @@ namespace Framework
         //! Returns the name of a specific image
         //! \param i The index of the image whose name should be returned
         //! \return The name of the image
-        DLLEXPORT Text* getBild(int i) const;
+        DLLEXPORT Text* getImage(int i) const;
         //! Returns the name of a specific image
         //! \param i The index of the image whose name should be returned
         //! \return The name of the image without increased reference counter
-        DLLEXPORT Text* zBild(int i) const;
+        DLLEXPORT Text* zImage(int i) const;
         //! Returns the index of the first byte of an image in the file
         //! \param txt The name of the image whose start should be found
         //! \return -1 if the image was not found.
-        DLLEXPORT __int64 getBildPosition(Text* txt) const;
+        DLLEXPORT __int64 getImagePosition(Text* txt) const;
         //! Returns the index of the first byte of an image in the file.
         //! If the index does not exist, std::out_of_range is thrown.
         //! \param index The index of the image whose start should be found
-        DLLEXPORT __int64 getBildPosition(int index) const;
+        DLLEXPORT __int64 getImagePosition(int index) const;
         //! Returns the index of a specific image
         //! \param txt The name of the image
         //! \return -1 if the image was not found
-        DLLEXPORT int getBildIndex(Text* txt) const;
+        DLLEXPORT int getImageIndex(Text* txt) const;
         //! Returns the number of images in the file
         DLLEXPORT int getbAnzahl() const;
         //! Returns a list of images in the file without increased reference
         //! counter. The list should not be modified
-        DLLEXPORT RCArray<Text>* zBildListe() const;
+        DLLEXPORT RCArray<Text>* zImageListe() const;
     };
 
     //! Information stored in the LTDB file header for a single image
@@ -223,7 +223,7 @@ namespace Framework
     {
     private:
         Punkt gr;
-        Bild* b;
+        Image* b;
         int dateiSize;
 
     public:
@@ -248,14 +248,14 @@ namespace Framework
         DLLEXPORT void laden(FBalken* zF, std::ifstream* inF);
         //! Sets the image to be saved
         //! \param b The image to save
-        DLLEXPORT void setBild(Bild* b);
+        DLLEXPORT void setImage(Image* b);
         //! Saves the pixel data of the image in an LTDB file
         //! \param zF A progress bar that can be 0
         //! \param outF The opened ofstream of the LTDB file pointing to the
         //! correct position
         DLLEXPORT void speichern(FBalken* zF, std::ofstream* outF) const;
         //! Returns the loaded image
-        DLLEXPORT Bild* getBild() const;
+        DLLEXPORT Image* getImage() const;
         //! Returns the size of the image
         DLLEXPORT const Punkt& getSize() const;
     };
@@ -291,21 +291,21 @@ namespace Framework
         //! \param zF A progress bar that can be 0
         //! \param name The name of the image to load
         //! \return The loaded image. 0 if the image was not found
-        DLLEXPORT Bild* laden(FBalken* zF, Text* name);
+        DLLEXPORT Image* laden(FBalken* zF, Text* name);
         //! Saves a new image in the LTDB file
         //! \param zF A progress bar that can be 0
         //! \param bild The image to save
         //! \param name The name under which the image should be saved
         //! \return Number of warnings that occurred while converting the name
         //! to a valid name. -1 if an image with the same name already exists
-        DLLEXPORT int speichern(FBalken* zF, Bild* bild, Text* name);
+        DLLEXPORT int speichern(FBalken* zF, Image* bild, Text* name);
         //! Returns a list of stored images.
         //! The list should not be modified
-        DLLEXPORT RCArray<Text>* zBildListe();
+        DLLEXPORT RCArray<Text>* zImageListe();
         //! Returns the path to the LTDB file
         DLLEXPORT Text* getPfad() const;
         //! Returns the number of images in the LTDB file
-        DLLEXPORT int getBildAnzahl() const;
+        DLLEXPORT int getImageAnzahl() const;
         //! Checks whether the LTDB file exists
         DLLEXPORT bool istOffen() const;
     };
@@ -558,10 +558,10 @@ namespace Framework
         DLLEXPORT void erstelleDatei();
         //! Saves an entire font to the file
         //! \param schrift The font to save
-        DLLEXPORT void speicherSchrift(Schrift* schrift);
+        DLLEXPORT void saveFont(Font* schrift);
         //! Loads the entire font from the file
         //! \return The loaded font. 0 if an error occurred while loading
-        DLLEXPORT Schrift* ladeSchrift();
+        DLLEXPORT Font* loadFont();
         //! Loads a single font size from the file
         //! \param schriftgroesse The font size to load
         //! \return An alphabet with the characters in the font size. 0 if

Font.cpp

@@ -201,21 +201,21 @@ Alphabet* AlphabetArray::zAlphabet(
     return alphabets[sg];
 }
 
-// Contents of the Schrift class from Font.h
+// Contents of the Font class from Font.h
 // Constructor
-Schrift::Schrift()
+Font::Font()
     : ReferenceCounter(),
       alphabetAnzahl(0),
       alphabet(new AlphabetArray())
 {}
 
 // Destructor
-Schrift::~Schrift()
+Font::~Font()
 {
     delete alphabet;
 }
 
-bool Schrift::addAlphabet(
+bool Font::addAlphabet(
     Alphabet* alphabet) // Adds an alphabet to the font
 {
     if (this->alphabet->addAlphabet(alphabet))
@@ -226,13 +226,13 @@ bool Schrift::addAlphabet(
     return false;
 }
 
-void Schrift::removeAlphabet(unsigned char sg) // Removes an alphabet
+void Font::removeAlphabet(unsigned char sg) // Removes an alphabet
 {
     if (alphabet->removeAlphabet(sg)) --alphabetAnzahl;
 }
 
 // constant
-Alphabet* Schrift::getAlphabet(unsigned char sg) const
+Alphabet* Font::getAlphabet(unsigned char sg) const
 {
     Alphabet* drawAlphabet = alphabet->zAlphabet(sg);
     if (!drawAlphabet)
@@ -254,7 +254,7 @@ Alphabet* Schrift::getAlphabet(unsigned char sg) const
     return dynamic_cast<Alphabet*>(drawAlphabet->getThis());
 }
 
-Alphabet* Schrift::zAlphabet(unsigned char sg) const
+Alphabet* Font::zAlphabet(unsigned char sg) const
 {
     Alphabet* drawAlphabet = alphabet->zAlphabet(sg);
     if (!drawAlphabet)
@@ -276,7 +276,7 @@ Alphabet* Schrift::zAlphabet(unsigned char sg) const
     return drawAlphabet;
 }
 
-unsigned char Schrift::getAlphabetAnzahl()
+unsigned char Font::getAlphabetAnzahl()
     const // returns the number of alphabets contained in the font
 {
     return alphabetAnzahl;
@@ -286,7 +286,7 @@ TextRenderer::TextRenderer()
     : TextRenderer(0)
 {}
 
-TextRenderer::TextRenderer(Schrift* schrift)
+TextRenderer::TextRenderer(Font* schrift)
     : ReferenceCounter()
 {
     s = schrift;
@@ -301,7 +301,7 @@ TextRenderer::~TextRenderer()
     if (s) s->release();
 }
 
-void TextRenderer::setSchriftZ(Schrift* schrift)
+void TextRenderer::setFontZ(Font* schrift)
 {
     if (s != schrift)
     {
@@ -340,13 +340,13 @@ void TextRenderer::setSchriftZ(Schrift* schrift)
     }
 }
 
-Schrift* TextRenderer::getSchrift()
+Font* TextRenderer::getFont()
 {
-    if (s) return dynamic_cast<Schrift*>(s->getThis());
+    if (s) return dynamic_cast<Font*>(s->getThis());
     return 0;
 }
 
-Schrift* TextRenderer::zSchrift()
+Font* TextRenderer::zFont()
 {
     return s;
 }
@@ -459,7 +459,7 @@ void TextRenderer::textFormatieren(Text* zTxt, int maxBreite)
 void TextRenderer::renderText(int x,
     int y,
     const char* txt,
-    Bild& zRObj,
+    Image& zRObj,
     std::function<int(int, int, int)> f,
     int cpos,
     int cf,
@@ -528,7 +528,7 @@ void TextRenderer::renderText(int x,
 void TextRenderer::renderText(int x,
     int y,
     const char* txt,
-    Bild& zRObj,
+    Image& zRObj,
     int f,
     int cpos,
     int cf,
@@ -560,7 +560,7 @@ void TextRenderer::renderText(int x,
 void TextRenderer::renderChar(int& x,
     int y,
     char c,
-    Bild& zRObj,
+    Image& zRObj,
     int color,
     bool underlined,
     bool selected,
@@ -808,7 +808,7 @@ GravurTextRenderer::GravurTextRenderer()
     : GravurTextRenderer(0)
 {}
 
-GravurTextRenderer::GravurTextRenderer(Schrift* schrift)
+GravurTextRenderer::GravurTextRenderer(Font* schrift)
     : TextRenderer(schrift)
 {}
 
@@ -827,7 +827,7 @@ GravurTextRenderer::~GravurTextRenderer() {}
 void GravurTextRenderer::renderChar(int& x,
     int y,
     char c,
-    Bild& zRObj,
+    Image& zRObj,
     int color,
     bool underlined,
     bool selected,
@@ -1001,7 +1001,7 @@ KursivTextRenderer::KursivTextRenderer()
     : KursivTextRenderer(0)
 {}
 
-KursivTextRenderer::KursivTextRenderer(Schrift* schrift)
+KursivTextRenderer::KursivTextRenderer(Font* schrift)
     : TextRenderer(schrift)
 {}
 
@@ -1020,7 +1020,7 @@ KursivTextRenderer::~KursivTextRenderer() {}
 void KursivTextRenderer::renderChar(int& x,
     int y,
     char c,
-    Bild& zRObj,
+    Image& zRObj,
     int color,
     bool underlined,
     bool selected,

Font.h

@@ -9,11 +9,11 @@
 
 namespace Framework
 {
-    class Bild;      //! Image.h
+    class Image;      //! Image.h
     class Text;      //! Text.h
     class Buchstabe; //! from this file
     class Alphabet;  //! from this file
-    class Schrift;   //! from this file
+    class Font;   //! from this file
 
     //! Stores the alpha values of a character of a specific font.
     //! The other color values are determined by the font color. Hence only
@@ -64,7 +64,7 @@ namespace Framework
     };
 
     //! Stores all characters of the same font size.
-    //! Used by the Schrift class
+    //! Used by the Font class
     class Alphabet : public virtual ReferenceCounter
     {
     private:
@@ -104,7 +104,7 @@ namespace Framework
     };
 
     //! Stores a list of alphabets with different font sizes.
-    //! Used by the Schrift class to store all characters sorted by font size.
+    //! Used by the Font class to store all characters sorted by font size.
     class AlphabetArray
     {
     private:
@@ -135,7 +135,7 @@ namespace Framework
     };
 
     //! Stores all characters of a font in different font sizes
-    class Schrift : public virtual ReferenceCounter
+    class Font : public virtual ReferenceCounter
     {
     private:
         unsigned char alphabetAnzahl;
@@ -143,9 +143,9 @@ namespace Framework
 
     public:
         //! Creates an empty font
-        DLLEXPORT Schrift();
+        DLLEXPORT Font();
         //! Deletes the object
-        DLLEXPORT ~Schrift();
+        DLLEXPORT ~Font();
         //! Adds an alphabet to the font. If an alphabet of the same font
         //! size already exists, the alphabet is not added
         //! \param alphabet The alphabet to add
@@ -169,7 +169,7 @@ namespace Framework
     class TextRenderer : public virtual ReferenceCounter
     {
     protected:
-        Schrift* s;
+        Font* s;
         int schriftSize;
         int zeilenAbstand;
         int zeichenAbstand;
@@ -178,11 +178,11 @@ namespace Framework
 
     public:
         DLLEXPORT TextRenderer();
-        DLLEXPORT TextRenderer(Schrift* schrift);
+        DLLEXPORT TextRenderer(Font* schrift);
         DLLEXPORT virtual ~TextRenderer();
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
-        DLLEXPORT Schrift* getSchrift();
-        DLLEXPORT Schrift* zSchrift();
+        DLLEXPORT void setFontZ(Font* schrift);
+        DLLEXPORT Font* getFont();
+        DLLEXPORT Font* zFont();
         //! Sets the font size to draw with. The font automatically
         //! selects the appropriate alphabet for drawing \param sg The font size
         DLLEXPORT void setSchriftSize(int sg);
@@ -212,7 +212,7 @@ namespace Framework
         DLLEXPORT virtual void renderText(int x,
             int y,
             const char* txt,
-            Bild& zRObj,
+            Image& zRObj,
             std::function<int(int, int, int)> f,
             int cpos = -1,
             int cf = 0,
@@ -233,7 +233,7 @@ namespace Framework
         DLLEXPORT virtual void renderText(int x,
             int y,
             const char* txt,
-            Bild& zRObj,
+            Image& zRObj,
             int f,
             int cpos = -1,
             int cf = 0,
@@ -253,7 +253,7 @@ namespace Framework
         DLLEXPORT virtual void renderChar(int& x,
             int y,
             char c,
-            Bild& zRObj,
+            Image& zRObj,
             int color,
             bool underlined = 0,
             bool selected = 0,
@@ -295,7 +295,7 @@ namespace Framework
     {
     public:
         DLLEXPORT GravurTextRenderer();
-        DLLEXPORT GravurTextRenderer(Schrift* schrift);
+        DLLEXPORT GravurTextRenderer(Font* schrift);
         DLLEXPORT virtual ~GravurTextRenderer();
         //! Draws a specific character with coloring onto an image.
         //! Use (setPosition) and (setDrawSchriftGroesse) to change position
@@ -311,7 +311,7 @@ namespace Framework
         DLLEXPORT virtual void renderChar(int& x,
             int y,
             char c,
-            Bild& zRObj,
+            Image& zRObj,
             int color,
             bool underlined = 0,
             bool selected = 0,
@@ -330,7 +330,7 @@ namespace Framework
     {
     public:
         DLLEXPORT KursivTextRenderer();
-        DLLEXPORT KursivTextRenderer(Schrift* schrift);
+        DLLEXPORT KursivTextRenderer(Font* schrift);
         DLLEXPORT virtual ~KursivTextRenderer();
         //! Draws a specific character with coloring onto an image.
         //! Use (setPosition) and (setDrawSchriftGroesse) to change position
@@ -346,7 +346,7 @@ namespace Framework
         DLLEXPORT virtual void renderChar(int& x,
             int y,
             char c,
-            Bild& zRObj,
+            Image& zRObj,
             int color,
             bool underlined = 0,
             bool selected = 0,

Globals.h

@@ -30,9 +30,9 @@ namespace Framework
 
 #ifdef WIN32
     class Maus;          //! Mouse.h
-    class WFensterArray; //! Window.h
+    class NativeWindowArray; //! Window.h
 
-    Global WFensterArray WFensterA;
+    Global NativeWindowArray nativeWindows;
     Global bool MausTrack;
     Global Maus MausZeiger;
     Global bool msgExit;

GraphicsApi.cpp

@@ -27,7 +27,7 @@ GraphicsApi::~GraphicsApi()
 }
 
 void GraphicsApi::initialize(
-    WFenster* fenster, Vec2<int> backBufferSize, bool fullScreen)
+    NativeWindow* fenster, Vec2<int> backBufferSize, bool fullScreen)
 {
 #ifdef _WIN32
     if (this->fenster) this->fenster->release();
@@ -57,7 +57,7 @@ void GraphicsApi::renderKamera(Kam3D* zKamera) {}
 
 void GraphicsApi::renderKamera(Kam3D* zKamera, Textur* zTarget) {}
 
-Textur* GraphicsApi::createOrGetTextur(const char* name, Bild* b)
+Textur* GraphicsApi::createOrGetTextur(const char* name, Image* b)
 {
     if (b) b->release();
     return 0;

GraphicsApi.h

@@ -48,8 +48,8 @@ struct tagRECT;
 
 namespace Framework
 {
-    class WFenster;
-    class Bild;
+    class NativeWindow;
+    class Image;
     class Textur;
     class DX11PixelShader;
     class DX11VertexShader;
@@ -91,7 +91,7 @@ namespace Framework
     {
     protected:
         GraphicApiType typ;
-        WFenster* fenster;
+        NativeWindow* fenster;
         Vec2<int> backBufferSize;
         Model3DList* modelList;
         int nextModelId;
@@ -106,7 +106,7 @@ namespace Framework
         DLLEXPORT GraphicsApi(GraphicApiType typ);
         DLLEXPORT virtual ~GraphicsApi();
         DLLEXPORT virtual void initialize(
-            WFenster* fenster, Vec2<int> backBufferSize, bool fullScreen);
+            NativeWindow* fenster, Vec2<int> backBufferSize, bool fullScreen);
         DLLEXPORT virtual void setBackBufferSize(Vec2<int> size);
         DLLEXPORT virtual void setFullScreen(bool fullScreen);
         DLLEXPORT virtual void update() = 0;
@@ -116,11 +116,11 @@ namespace Framework
         DLLEXPORT virtual void renderKamera(Kam3D* zKamera, Textur* zTarget);
         DLLEXPORT virtual void presentFrame() = 0;
         DLLEXPORT virtual Textur* createOrGetTextur(
-            const char* name, Bild* b = 0);
+            const char* name, Image* b = 0);
         DLLEXPORT GraphicApiType getTyp() const;
         DLLEXPORT Vec2<int> getBackBufferSize() const;
         DLLEXPORT bool isFullScreen() const;
-        DLLEXPORT virtual Bild* zUIRenderBild() const = 0;
+        DLLEXPORT virtual Image* zUIRenderImage() const = 0;
         //! returns the specified model without increased reference counter
         DLLEXPORT virtual Model3DData* zModel(const char* name);
         //! returns the specified model with increased reference counter
@@ -143,7 +143,7 @@ namespace Framework
         IDirect3DDevice9* pDevice;
         IDirect3DSurface9* pBackBuffer;
         _D3DLOCKED_RECT* backRect;
-        Bild* uiBild;
+        Image* uiImage;
 
         DLLEXPORT virtual DXBuffer* createIndexBuffer() override;
         DLLEXPORT virtual DXBuffer* createVertexBuffer() override;
@@ -151,7 +151,7 @@ namespace Framework
     public:
         DLLEXPORT DirectX9();
         DLLEXPORT ~DirectX9();
-        DLLEXPORT void initialize(WFenster* fenster,
+        DLLEXPORT void initialize(NativeWindow* fenster,
             Vec2<int> backBufferSize,
             bool fullScreen) override;
         DLLEXPORT void update() override;
@@ -159,8 +159,8 @@ namespace Framework
             bool fill2D, bool fill3D, int fillColor) override;
         DLLEXPORT void renderKamera(Kam3D* zKamera) override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Bild* b) override;
-        DLLEXPORT Bild* zUIRenderBild() const override;
+        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Image* zUIRenderImage() const override;
 
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
     };
@@ -209,7 +209,7 @@ namespace Framework
     public:
         DLLEXPORT DirectX11();
         DLLEXPORT ~DirectX11();
-        DLLEXPORT void initialize(WFenster* fenster,
+        DLLEXPORT void initialize(NativeWindow* fenster,
             Vec2<int> backBufferSize,
             bool fullScreen) override;
         DLLEXPORT void update() override;
@@ -218,8 +218,8 @@ namespace Framework
         DLLEXPORT void renderKamera(Kam3D* zKamera) override;
         DLLEXPORT void renderKamera(Kam3D* zKamera, Textur* zTarget) override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Bild* b) override;
-        DLLEXPORT Bild* zUIRenderBild() const override;
+        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Image* zUIRenderImage() const override;
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
         //! Checks whether a sphere is in the visible space of the world and
         //! needs to be drawn \param pos The center of the sphere \param
@@ -274,7 +274,7 @@ namespace Framework
     public:
         DLLEXPORT DirectX12();
         DLLEXPORT ~DirectX12();
-        DLLEXPORT void initialize(WFenster* fenster,
+        DLLEXPORT void initialize(NativeWindow* fenster,
             Vec2<int> backBufferSize,
             bool fullScreen) override;
         DLLEXPORT void update() override;
@@ -284,8 +284,8 @@ namespace Framework
         //! TODO: DLLEXPORT void renderKamera( Kam3D* zKamera, Textur* zTarget )
         //! override;
         DLLEXPORT void presentFrame() override;
-        DLLEXPORT Textur* createOrGetTextur(const char* name, Bild* b) override;
-        DLLEXPORT Bild* zUIRenderBild() const override;
+        DLLEXPORT Textur* createOrGetTextur(const char* name, Image* b) override;
+        DLLEXPORT Image* zUIRenderImage() const override;
         DLLEXPORT virtual DXBuffer* createStructuredBuffer(int eSize) override;
         //! Checks whether a sphere is in the visible space of the world and
         //! needs to be drawn \param pos The center of the sphere \param

Image.cpp

@@ -33,9 +33,9 @@
 
 using namespace Framework;
 
-// Contents of the Bild class from Image.h
+// Contents of the Image class from Image.h
 // Constructor
-Bild::Bild(bool options)
+Image::Image(bool options)
     : ReferenceCounter(),
       fc(0),
       delFc(1),
@@ -53,7 +53,7 @@ Bild::Bild(bool options)
 }
 
 // Destructor
-Bild::~Bild()
+Image::~Image()
 {
     if (delFc)
     {
@@ -67,17 +67,17 @@ Bild::~Bild()
 }
 
 // privat
-inline void Bild::alphaPixelP(int x, int y, int f)
+inline void Image::alphaPixelP(int x, int y, int f)
 {
     alphaPixelP(fc[x + y * size.x], f);
 }
 
-inline void Bild::alphaPixelP3D(int x, int y, int f)
+inline void Image::alphaPixelP3D(int x, int y, int f)
 {
     alphaPixelP3D(fc[x + y * size.x], f);
 }
 
-inline void Bild::alphaPixelAssozP(int& fc, int f)
+inline void Image::alphaPixelAssozP(int& fc, int f)
 {
     unsigned char* fc1 = (unsigned char*)&fc;
     unsigned char* fc2 = (unsigned char*)&f;
@@ -93,7 +93,7 @@ inline void Bild::alphaPixelAssozP(int& fc, int f)
     fc1[3] = a;
 }
 
-inline void Bild::alphaPixelP3D(int& fc, int colorb)
+inline void Image::alphaPixelP3D(int& fc, int colorb)
 {
     int alpha = ((colorb >> 24) & 0xFF);
     int oldAlpha = ((fc >> 24) & 0xFF);
@@ -111,7 +111,7 @@ inline void Bild::alphaPixelP3D(int& fc, int colorb)
        | (fc == 0) * colorb;
 }
 
-inline void Bild::alphaPixelP(int& fc, int colorb)
+inline void Image::alphaPixelP(int& fc, int colorb)
 {
     int alpha = ((colorb >> 24) & 0xFF);
     int na = (0x100 - alpha);
@@ -122,7 +122,7 @@ inline void Bild::alphaPixelP(int& fc, int colorb)
        | ((fc & 0xFF000000));
 }
 
-char Bild::getOutCode(Punkt p) const
+char Image::getOutCode(Punkt p) const
 {
     char ret = 0;
     if (p.x < dPosA[doa].x) ret = 1;
@@ -132,7 +132,7 @@ char Bild::getOutCode(Punkt p) const
     return ret;
 }
 
-void Bild::drawFlatDreieck(
+void Image::drawFlatDreieck(
     int y1, int y2, float m1, float b1, float m2, float b2, int farbe)
 {
     const int yStart = max(y1, dPosA[doa].y);
@@ -146,7 +146,7 @@ void Bild::drawFlatDreieck(
     }
 }
 
-void Bild::drawFlatDreieckTextur(int y1,
+void Image::drawFlatDreieckTextur(int y1,
     int y2,
     double m1,
     double b1,
@@ -162,7 +162,7 @@ void Bild::drawFlatDreieckTextur(int y1,
     double ty_2o,
     double txf,
     double tyf,
-    const Bild& textur)
+    const Image& textur)
 {
     const double yStart = max(y1, dPosA[doa].y);
     const double yEnd = min(y2, dSizeA[doa].y);
@@ -185,7 +185,7 @@ void Bild::drawFlatDreieckTextur(int y1,
     }
 }
 
-void Bild::drawFlatDreieckAlpha(
+void Image::drawFlatDreieckAlpha(
     int y1, int y2, float m1, float b1, float m2, float b2, int farbe)
 {
     const int yStart = max((int)(y1 + 0.5), dPosA[doa].y);
@@ -216,7 +216,7 @@ void Bild::drawFlatDreieckAlpha(
     }
 }
 
-void Bild::drawFlatDreieckTexturAlpha(int y1,
+void Image::drawFlatDreieckTexturAlpha(int y1,
     int y2,
     double m1,
     double b1,
@@ -232,7 +232,7 @@ void Bild::drawFlatDreieckTexturAlpha(int y1,
     double ty_2o,
     double txf,
     double tyf,
-    const Bild& textur)
+    const Image& textur)
 {
     const double yStart = max(y1, dPosA[doa].y);
     const double yEnd = min(y2, dSizeA[doa].y);
@@ -255,13 +255,13 @@ void Bild::drawFlatDreieckTexturAlpha(int y1,
     }
 }
 
-void Bild::drawLinieHTextur(Vec2<double> p,
+void Image::drawLinieHTextur(Vec2<double> p,
     double len,
     Vec2<double> ta,
     Vec2<double> tb,
     double txo,
     double tyo,
-    const Bild& textur) // draws a horizontal line
+    const Image& textur) // draws a horizontal line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
@@ -306,13 +306,13 @@ void Bild::drawLinieHTextur(Vec2<double> p,
     rend = 1;
 }
 
-void Bild::drawLinieHTexturAlpha(Vec2<double> p,
+void Image::drawLinieHTexturAlpha(Vec2<double> p,
     double len,
     Vec2<double> ta,
     Vec2<double> tb,
     double txo,
     double tyo,
-    const Bild& textur) // draws a horizontal line
+    const Image& textur) // draws a horizontal line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (len < 0)
@@ -382,7 +382,7 @@ void Bild::drawLinieHTexturAlpha(Vec2<double> p,
 
 // Checks if a rectangle is fully or partially within the drawing area.
 //  return 0 if the rectangle is not in the drawing area, 1 otherwise
-bool Bild::isAreaDrawable(int x, int y, int b, int h)
+bool Image::isAreaDrawable(int x, int y, int b, int h)
 {
     int dpx = dPosA[doa].x;
     int dpy = dPosA[doa].y;
@@ -398,12 +398,12 @@ bool Bild::isAreaDrawable(int x, int y, int b, int h)
 // color is 0, only the new one is copied with its alpha value. This is useful
 // for use in the 3D screen, where the drawn image is later displayed using alpha
 // blending
-void Bild::setAlpha3D(bool erlaubt)
+void Image::setAlpha3D(bool erlaubt)
 {
     alpha3D = erlaubt;
 }
 
-void Bild::setAlpha(
+void Image::setAlpha(
     unsigned char alpha) // sets the transparency for subsequent drawings
 {
     int last = this->alpha[alphaAnzahl];
@@ -413,12 +413,12 @@ void Bild::setAlpha(
         = (unsigned char)((255 - alpha) > last ? (255 - alpha) : last);
 }
 
-void Bild::releaseAlpha() // Releases alpha
+void Image::releaseAlpha() // Releases alpha
 {
     --alphaAnzahl;
 }
 
-void Bild::setPixelBuffer(int* buffer,
+void Image::setPixelBuffer(int* buffer,
     bool deleteBuffer,
     int breite,
     int height) // sets the pointer to the image pixels
@@ -439,7 +439,7 @@ void Bild::setPixelBuffer(int* buffer,
     rend = 1;
 }
 
-void Bild::neuBild(int breite, int height, int fillColor)
+void Image::neuImage(int breite, int height, int fillColor)
 {
     if (fc && delFc) delete[] fc;
     size.x = breite;
@@ -457,7 +457,7 @@ void Bild::neuBild(int breite, int height, int fillColor)
     rend = 1;
 }
 
-void Bild::setFarbe(int f)
+void Image::setFarbe(int f)
 {
     if ((f & 0xFF) == ((f >> 8) & 0xFF) && (f & 0xFF) == ((f >> 16) & 0xFF)
         && (f & 0xFF) == ((f >> 24) & 0xFF))
@@ -470,7 +470,7 @@ void Bild::setFarbe(int f)
     rend = 1;
 }
 
-void Bild::fillRegion(int x, int y, int b, int h, int ff)
+void Image::fillRegion(int x, int y, int b, int h, int ff)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
@@ -507,7 +507,7 @@ void Bild::fillRegion(int x, int y, int b, int h, int ff)
     rend = 1;
 }
 
-void Bild::alphaRegion(int x, int y, int b, int h, int ff)
+void Image::alphaRegion(int x, int y, int b, int h, int ff)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -560,7 +560,7 @@ void Bild::alphaRegion(int x, int y, int b, int h, int ff)
     rend = 1;
 }
 
-void Bild::alphaPixel2D(int i, int f)
+void Image::alphaPixel2D(int i, int f)
 {
     if (!alpha[alphaAnzahl])
         alphaPixelP(fc[i], f);
@@ -574,7 +574,7 @@ void Bild::alphaPixel2D(int i, int f)
     }
 }
 
-void Bild::alphaPixel3D(int i, int f)
+void Image::alphaPixel3D(int i, int f)
 {
     if (!alpha[alphaAnzahl])
         alphaPixelP3D(fc[i], f);
@@ -588,7 +588,7 @@ void Bild::alphaPixel3D(int i, int f)
     }
 }
 
-void Bild::alphaPixel2D(int x, int y, int f)
+void Image::alphaPixel2D(int x, int y, int f)
 {
     if (!alpha[alphaAnzahl]) alphaPixelP(fc[x + y * size.x], f);
     if (alpha[alphaAnzahl] < 0xFF)
@@ -601,7 +601,7 @@ void Bild::alphaPixel2D(int x, int y, int f)
     }
 }
 
-void Bild::alphaPixel3D(int x, int y, int f)
+void Image::alphaPixel3D(int x, int y, int f)
 {
     if (!alpha[alphaAnzahl]) alphaPixelP3D(fc[x + y * size.x], f);
     if (alpha[alphaAnzahl] < 0xFF)
@@ -614,7 +614,7 @@ void Bild::alphaPixel3D(int x, int y, int f)
     }
 }
 
-void Bild::alphaPixelDP2D(int x, int y, int f)
+void Image::alphaPixelDP2D(int x, int y, int f)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -634,7 +634,7 @@ void Bild::alphaPixelDP2D(int x, int y, int f)
     rend = 1;
 }
 
-void Bild::alphaPixelDP3D(int x, int y, int f)
+void Image::alphaPixelDP3D(int x, int y, int f)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -654,7 +654,7 @@ void Bild::alphaPixelDP3D(int x, int y, int f)
     rend = 1;
 }
 
-void Bild::alphaPixelDP2D(int i, int f)
+void Image::alphaPixelDP2D(int i, int f)
 {
     int x = i % size.x;
     int y = i / size.x;
@@ -662,7 +662,7 @@ void Bild::alphaPixelDP2D(int i, int f)
     rend = 1;
 }
 
-void Bild::alphaPixelDP3D(int i, int f)
+void Image::alphaPixelDP3D(int i, int f)
 {
     int x = i % size.x;
     int y = i / size.x;
@@ -670,7 +670,7 @@ void Bild::alphaPixelDP3D(int i, int f)
     rend = 1;
 }
 
-void Bild::setPixelDP(int x, int y, int f)
+void Image::setPixelDP(int x, int y, int f)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
@@ -692,7 +692,7 @@ void Bild::setPixelDP(int x, int y, int f)
     rend = 1;
 }
 
-void Bild::setPixelDP(int i, int f)
+void Image::setPixelDP(int i, int f)
 {
     int x = i % size.x;
     int y = i / size.x;
@@ -700,7 +700,7 @@ void Bild::setPixelDP(int i, int f)
     rend = 1;
 }
 
-void Bild::drawLinieH(
+void Image::drawLinieH(
     int x, int y, int len, int f) // draws a horizontal line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -736,7 +736,7 @@ void Bild::drawLinieH(
     rend = 1;
 }
 
-void Bild::drawLinieV(
+void Image::drawLinieV(
     int x, int y, int len, int f) // draws a vertical line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -772,7 +772,7 @@ void Bild::drawLinieV(
     rend = 1;
 }
 
-void Bild::drawLinieHAlpha(
+void Image::drawLinieHAlpha(
     int x, int y, int len, int f) // draws a horizontal line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -821,7 +821,7 @@ void Bild::drawLinieHAlpha(
     rend = 1;
 }
 
-void Bild::drawLinieVAlpha(
+void Image::drawLinieVAlpha(
     int x, int y, int len, int f) // draws a vertical line
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -870,7 +870,7 @@ void Bild::drawLinieVAlpha(
     rend = 1;
 }
 
-void Bild::drawLinieBordered(Punkt a, Punkt b, int bc, int fc)
+void Image::drawLinieBordered(Punkt a, Punkt b, int bc, int fc)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
@@ -975,7 +975,7 @@ void Bild::drawLinieBordered(Punkt a, Punkt b, int bc, int fc)
     }
 }
 
-void Bild::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
+void Image::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     a += drawOff[doa];
@@ -1142,7 +1142,7 @@ void Bild::drawLinieBorderedAlpha(Punkt a, Punkt b, int bc, int fc)
     }
 }
 
-void Bild::drawLinie(Punkt a,
+void Image::drawLinie(Punkt a,
     Punkt b,
     int fc) // draws a line from Point(x1, y1) to Point(x2, y2)
 {
@@ -1233,7 +1233,7 @@ void Bild::drawLinie(Punkt a,
     }
 }
 
-void Bild::drawLinieAlpha(Punkt a, Punkt b, int fc)
+void Image::drawLinieAlpha(Punkt a, Punkt b, int fc)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     a += drawOff[doa];
@@ -1341,7 +1341,7 @@ void Bild::drawLinieAlpha(Punkt a, Punkt b, int fc)
     }
 }
 
-void Bild::fillCircle(int xOff,
+void Image::fillCircle(int xOff,
     int yOff,
     int r,
     int fc) // fills a circle around Point(xOff, yOff) with radius r
@@ -1351,7 +1351,7 @@ void Bild::fillCircle(int xOff,
         drawKreis(xOff, yOff, i, fc);
 }
 
-void Bild::drawKreis(int xOff,
+void Image::drawKreis(int xOff,
     int yOff,
     int r,
     int fc) // draws a circle around Point(xOff, yOff) with radius r
@@ -1401,7 +1401,7 @@ void Bild::drawKreis(int xOff,
     rend = 1;
 }
 
-void Bild::drawKreisAlpha(int xOff, int yOff, int r, int fc)
+void Image::drawKreisAlpha(int xOff, int yOff, int r, int fc)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -1533,13 +1533,13 @@ void Bild::drawKreisAlpha(int xOff, int yOff, int r, int fc)
     rend = 1;
 }
 
-void Bild::drawBild(
-    int x, int y, int br, int hi, const Bild& zBild) // draws zBild
+void Image::drawImage(
+    int x, int y, int br, int hi, const Image& zImage) // draws zImage
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        alphaBild(x, y, br, hi, zBild);
+        alphaImage(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -1549,16 +1549,16 @@ void Bild::drawBild(
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getBreite());
-    hi = minInt(hi, zBild.getHeight());
+    br = minInt(br, zImage.getBreite());
+    hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     for (int yy = yst2; yy < dgy; ++yy)
     {
@@ -1570,7 +1570,7 @@ void Bild::drawBild(
     rend = 1;
 }
 
-void Bild::alphaBildAssoz(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImageAssoz(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -1580,16 +1580,16 @@ void Bild::alphaBildAssoz(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getBreite());
-    hi = minInt(hi, zBild.getHeight());
+    br = minInt(br, zImage.getBreite());
+    hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     if (!alpha[alphaAnzahl])
     {
         int xx, ygr, ygr2;
@@ -1621,7 +1621,7 @@ void Bild::alphaBildAssoz(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::alphaBild(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImage(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -1631,16 +1631,16 @@ void Bild::alphaBild(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getBreite());
-    hi = minInt(hi, zBild.getHeight());
+    br = minInt(br, zImage.getBreite());
+    hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     if (!alpha[alphaAnzahl])
     {
         int xx, ygr, ygr2;
@@ -1708,16 +1708,16 @@ void Bild::alphaBild(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::drawBild90(int x,
+void Image::drawImage90(int x,
     int y,
     int br,
     int hi,
-    const Bild& zBild) // Draws an image rotated 90 degrees to the right
+    const Image& zImage) // Draws an image rotated 90 degrees to the right
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        alphaBild90(x, y, br, hi, zBild);
+        alphaImage90(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -1727,27 +1727,27 @@ void Bild::drawBild90(int x,
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getHeight());
-    hi = minInt(hi, zBild.getBreite());
+    br = minInt(br, zImage.getHeight());
+    hi = minInt(hi, zImage.getBreite());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int yy, xbb;
     for (int xx = xst2; xx < dgx; ++xx)
     {
-        xbb = (zBild.getHeight() - (xx - xst2 + xst + 1)) * bb;
+        xbb = (zImage.getHeight() - (xx - xst2 + xst + 1)) * bb;
         for (yy = yst2; yy < dgy; ++yy)
             fc[xx + yy * size.x] = ff[(yy - yst2 + yst) + xbb];
     }
     rend = 1;
 }
 
-void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImage90(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -1757,16 +1757,16 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getHeight());
-    hi = minInt(hi, zBild.getBreite());
+    br = minInt(br, zImage.getHeight());
+    hi = minInt(hi, zImage.getBreite());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     if (!alpha[alphaAnzahl])
     {
         int yy, xbb;
@@ -1774,7 +1774,7 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
         {
             for (int xx = xst2; xx < dgx; ++xx)
             {
-                xbb = (zBild.getHeight() - (xx - xst2 + xst + 1)) * bb;
+                xbb = (zImage.getHeight() - (xx - xst2 + xst + 1)) * bb;
                 for (yy = yst2; yy < dgy; ++yy)
                     alphaPixelP3D(xx, yy, ff[(yy - yst2 + yst) + xbb]);
             }
@@ -1783,7 +1783,7 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
         {
             for (int xx = xst2; xx < dgx; ++xx)
             {
-                xbb = (zBild.getHeight() - (xx - xst2 + xst + 1)) * bb;
+                xbb = (zImage.getHeight() - (xx - xst2 + xst + 1)) * bb;
                 for (yy = yst2; yy < dgy; ++yy)
                     alphaPixelP(xx, yy, ff[(yy - yst2 + yst) + xbb]);
             }
@@ -1796,7 +1796,7 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
         {
             for (int xx = xst2; xx < dgx; ++xx)
             {
-                xbb = (zBild.getHeight() - (xx - xst2 + xst + 1)) * bb;
+                xbb = (zImage.getHeight() - (xx - xst2 + xst + 1)) * bb;
                 for (yy = yst2; yy < dgy; ++yy)
                 {
                     int fc = ff[(yy - yst2 + yst) + xbb];
@@ -1811,7 +1811,7 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
         {
             for (int xx = xst2; xx < dgx; ++xx)
             {
-                xbb = (zBild.getHeight() - (xx - xst2 + xst + 1)) * bb;
+                xbb = (zImage.getHeight() - (xx - xst2 + xst + 1)) * bb;
                 for (yy = yst2; yy < dgy; ++yy)
                 {
                     int fc = ff[(yy - yst2 + yst) + xbb];
@@ -1826,16 +1826,16 @@ void Bild::alphaBild90(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::drawBild180(int x,
+void Image::drawImage180(int x,
     int y,
     int br,
     int hi,
-    const Bild& zBild) // Draws an image rotated 180 degrees to the right
+    const Image& zImage) // Draws an image rotated 180 degrees to the right
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        alphaBild180(x, y, br, hi, zBild);
+        alphaImage180(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -1845,28 +1845,28 @@ void Bild::drawBild180(int x,
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getBreite());
-    hi = minInt(hi, zBild.getHeight());
+    br = minInt(br, zImage.getBreite());
+    hi = minInt(hi, zImage.getHeight());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int xx, ygr, ybb;
     for (int yy = yst2; yy < dgy; ++yy)
     {
         ygr = yy * size.x;
-        ybb = (zBild.getHeight() - (yy - yst2 + yst + 1)) * bb;
+        ybb = (zImage.getHeight() - (yy - yst2 + yst + 1)) * bb;
         for (xx = xst2; xx < dgx; ++xx)
             fc[xx + ygr] = ff[(bb - (xx - xst2 + xst + 1)) + ybb];
     }
     rend = 1;
 }
 
-void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImage180(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -1876,16 +1876,16 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getHeight());
-    hi = minInt(hi, zBild.getBreite());
+    br = minInt(br, zImage.getHeight());
+    hi = minInt(hi, zImage.getBreite());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     if (!alpha[alphaAnzahl])
     {
         int xx, ygr, ybb;
@@ -1894,7 +1894,7 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
             for (int yy = yst2; yy < dgy; ++yy)
             {
                 ygr = yy * size.x;
-                ybb = (zBild.getHeight() - (yy - yst2 + yst + 1)) * bb;
+                ybb = (zImage.getHeight() - (yy - yst2 + yst + 1)) * bb;
                 for (xx = xst2; xx < dgx; ++xx)
                     alphaPixelP3D(
                         fc[xx + ygr], ff[(bb - (xx - xst2 + xst + 1)) + ybb]);
@@ -1905,7 +1905,7 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
             for (int yy = yst2; yy < dgy; ++yy)
             {
                 ygr = yy * size.x;
-                ybb = (zBild.getHeight() - (yy - yst2 + yst + 1)) * bb;
+                ybb = (zImage.getHeight() - (yy - yst2 + yst + 1)) * bb;
                 for (xx = xst2; xx < dgx; ++xx)
                     alphaPixelP(
                         fc[xx + ygr], ff[(bb - (xx - xst2 + xst + 1)) + ybb]);
@@ -1920,7 +1920,7 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
             for (int yy = yst2; yy < dgy; ++yy)
             {
                 ygr = yy * size.x;
-                ybb = (zBild.getHeight() - (yy - yst2 + yst + 1)) * bb;
+                ybb = (zImage.getHeight() - (yy - yst2 + yst + 1)) * bb;
                 for (xx = xst2; xx < dgx; ++xx)
                 {
                     int fc = ff[(bb - (xx - xst2 + xst + 1)) + ybb];
@@ -1936,7 +1936,7 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
             for (int yy = yst2; yy < dgy; ++yy)
             {
                 ygr = yy * size.x;
-                ybb = (zBild.getHeight() - (yy - yst2 + yst + 1)) * bb;
+                ybb = (zImage.getHeight() - (yy - yst2 + yst + 1)) * bb;
                 for (xx = xst2; xx < dgx; ++xx)
                 {
                     int fc = ff[(bb - (xx - xst2 + xst + 1)) + ybb];
@@ -1951,16 +1951,16 @@ void Bild::alphaBild180(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::drawBild270(int x,
+void Image::drawImage270(int x,
     int y,
     int br,
     int hi,
-    const Bild& zBild) // Draws an image rotated 270 degrees to the right
+    const Image& zImage) // Draws an image rotated 270 degrees to the right
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        alphaBild270(x, y, br, hi, zBild);
+        alphaImage270(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -1970,16 +1970,16 @@ void Bild::drawBild270(int x,
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getHeight());
-    hi = minInt(hi, zBild.getBreite());
+    br = minInt(br, zImage.getHeight());
+    hi = minInt(hi, zImage.getBreite());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int yy, xbb;
     for (int xx = xst2; xx < dgx; ++xx)
     {
@@ -1990,7 +1990,7 @@ void Bild::drawBild270(int x,
     rend = 1;
 }
 
-void Bild::alphaBild270(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImage270(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -2000,16 +2000,16 @@ void Bild::alphaBild270(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + hi < dpx || y + br < dpy || x >= dgx || y >= dgy) return;
-    br = minInt(br, zBild.getHeight());
-    hi = minInt(hi, zBild.getBreite());
+    br = minInt(br, zImage.getHeight());
+    hi = minInt(hi, zImage.getBreite());
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     if (!alpha[alphaAnzahl])
     {
         int yy, xbb;
@@ -2070,13 +2070,13 @@ void Bild::alphaBild270(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::drawBildSkall(
-    int x, int y, int br, int hi, const Bild& zBild) // draws zBild scaled
+void Image::drawImageSkall(
+    int x, int y, int br, int hi, const Image& zImage) // draws zImage scaled
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
     {
-        alphaBildSkall(x, y, br, hi, zBild);
+        alphaImageSkall(x, y, br, hi, zImage);
         return;
     }
     int dpx = dPosA[doa].x;
@@ -2086,16 +2086,16 @@ void Bild::drawBildSkall(
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    double xo = zBild.getBreite() / (double)br;
-    double yo = zBild.getHeight() / (double)hi;
+    double xo = zImage.getBreite() / (double)br;
+    double yo = zImage.getHeight() / (double)hi;
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     double xb = 0, yb = yst * yo;
     for (int yy = yst2; yy < dgy; ++yy, yb += yo)
@@ -2108,7 +2108,7 @@ void Bild::drawBildSkall(
     rend = 1;
 }
 
-void Bild::alphaBildSkall(int x, int y, int br, int hi, const Bild& zBild)
+void Image::alphaImageSkall(int x, int y, int br, int hi, const Image& zImage)
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -2118,16 +2118,16 @@ void Bild::alphaBildSkall(int x, int y, int br, int hi, const Bild& zBild)
     x += drawOff[doa].x;
     y += drawOff[doa].y;
     if (x + br < dpx || y + hi < dpy || x >= dgx || y >= dgy) return;
-    double xo = zBild.getBreite() / (double)br;
-    double yo = zBild.getHeight() / (double)hi;
+    double xo = zImage.getBreite() / (double)br;
+    double yo = zImage.getHeight() / (double)hi;
     int xst = maxInt(dpx - x, 0);
     int yst = maxInt(dpy - y, 0);
     int xst2 = maxInt(x, dpx);
     int yst2 = maxInt(y, dpy);
     dgx = minInt(x + br, dgx);
     dgy = minInt(y + hi, dgy);
-    int bb = zBild.getBreite();
-    int* ff = zBild.getBuffer();
+    int bb = zImage.getBreite();
+    int* ff = zImage.getBuffer();
     int xx, ygr, ygr2;
     double xb = 0;
     if (alpha3D)
@@ -2165,7 +2165,7 @@ void Bild::alphaBildSkall(int x, int y, int br, int hi, const Bild& zBild)
     rend = 1;
 }
 
-void Bild::drawDreieck(
+void Image::drawDreieck(
     Punkt a, Punkt b, Punkt c, int farbe) // fills a triangle
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -2230,13 +2230,13 @@ void Bild::drawDreieck(
     rend = 1;
 }
 
-void Bild::drawDreieckTextur(Punkt a,
+void Image::drawDreieckTextur(Punkt a,
     Punkt b,
     Punkt c,
     Punkt ta,
     Punkt tb,
     Punkt tc,
-    const Bild& textur) // fills a triangle
+    const Image& textur) // fills a triangle
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     if (alpha[alphaAnzahl])
@@ -2441,7 +2441,7 @@ void Bild::drawDreieckTextur(Punkt a,
     rend = 1;
 }
 
-void Bild::drawDreieckAlpha(
+void Image::drawDreieckAlpha(
     Punkt a, Punkt b, Punkt c, int farbe) // fills a triangle
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
@@ -2507,13 +2507,13 @@ void Bild::drawDreieckAlpha(
     rend = 1;
 }
 
-void Bild::drawDreieckTexturAlpha(Punkt a,
+void Image::drawDreieckTexturAlpha(Punkt a,
     Punkt b,
     Punkt c,
     Punkt ta,
     Punkt tb,
     Punkt tc,
-    const Bild& textur) // fills a triangle
+    const Image& textur) // fills a triangle
 {
     if (alpha[alphaAnzahl] == 0xFF) return;
     int dpx = dPosA[doa].x;
@@ -2713,7 +2713,7 @@ void Bild::drawDreieckTexturAlpha(Punkt a,
     rend = 1;
 }
 
-void Bild::replaceColorWithAlpha(int color)
+void Image::replaceColorWithAlpha(int color)
 {
     int r = (color & 0xFF0000) >> 16;
     int g = (color & 0xFF00) >> 8;
@@ -2736,7 +2736,7 @@ void Bild::replaceColorWithAlpha(int color)
     }
 }
 
-bool Bild::setDrawOptions(
+bool Image::setDrawOptions(
     const Punkt& pos, const Punkt& gr) // sets the draw options
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
@@ -2759,7 +2759,7 @@ bool Bild::setDrawOptions(
     return 1;
 }
 
-bool Bild::setDrawOptions(int x, int y, int br, int hi)
+bool Image::setDrawOptions(int x, int y, int br, int hi)
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
     int xx = dPosA[doa].x, yy = dPosA[doa].y;
@@ -2780,7 +2780,7 @@ bool Bild::setDrawOptions(int x, int y, int br, int hi)
     return 1;
 }
 
-bool Bild::setDrawOptionsErzwingen(
+bool Image::setDrawOptionsErzwingen(
     const Punkt& pos, const Punkt& gr) // sets the draw options
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
@@ -2798,7 +2798,7 @@ bool Bild::setDrawOptionsErzwingen(
     return 1;
 }
 
-bool Bild::setDrawOptionsErzwingen(
+bool Image::setDrawOptionsErzwingen(
     int x, int y, int br, int hi) // sets the draw options
 {
     int dx = drawOff[doa].x, dy = drawOff[doa].y;
@@ -2816,7 +2816,7 @@ bool Bild::setDrawOptionsErzwingen(
     return 1;
 }
 
-void Bild::setDrawOptionsReset()
+void Image::setDrawOptionsReset()
 {
     ++doa;
     dPosA[doa].x = 0;
@@ -2827,18 +2827,18 @@ void Bild::setDrawOptionsReset()
     drawOff[doa].y = 0;
 }
 
-void Bild::addScrollOffset(int xOff, int yOff) // sets scroll offset
+void Image::addScrollOffset(int xOff, int yOff) // sets scroll offset
 {
     drawOff[doa].x -= xOff;
     drawOff[doa].y -= yOff;
 }
 
-void Bild::releaseDrawOptions() // resets the draw options
+void Image::releaseDrawOptions() // resets the draw options
 {
     --doa;
 }
 
-bool Bild::getRend()
+bool Image::getRend()
 {
     bool ret = rend;
     rend = 0;
@@ -2846,58 +2846,58 @@ bool Bild::getRend()
 }
 
 // constant
-int* Bild::getBuffer() const // returns the buffer
+int* Image::getBuffer() const // returns the buffer
 {
     return fc;
 }
 
-int Bild::getPixel(int x, int y) const
+int Image::getPixel(int x, int y) const
 {
     if (x < 0 || y < 0 || x >= size.x || y >= size.y) return 0;
     return fc[x + y * size.x];
 }
 
-const Punkt& Bild::getSize() const // returns the size
+const Punkt& Image::getSize() const // returns the size
 {
     return size;
 }
 
-int Bild::getBreite() const // returns the width
+int Image::getBreite() const // returns the width
 {
     return size.x;
 }
 
-int Bild::getHeight() const // returns the height
+int Image::getHeight() const // returns the height
 {
     return size.y;
 }
 
-unsigned char Bild::getAlpha() const // returns the alpha value
+unsigned char Image::getAlpha() const // returns the alpha value
 {
     return (unsigned char)(255 - alpha[alphaAnzahl]);
 }
 
-const Punkt& Bild::getDrawPos() const
+const Punkt& Image::getDrawPos() const
 {
     return dPosA[doa];
 }
 
-const Punkt& Bild::getDrawGr() const
+const Punkt& Image::getDrawGr() const
 {
     return dSizeA[doa];
 }
 
-const Punkt& Bild::getDrawOff() const
+const Punkt& Image::getDrawOff() const
 {
     return drawOff[doa];
 }
 
-bool Bild::hasAlpha3D() const
+bool Image::hasAlpha3D() const
 {
     return alpha3D;
 }
 
-int Bild::getAverageColor() const
+int Image::getAverageColor() const
 {
     double a = 0;
     double r = 0;
@@ -2920,9 +2920,9 @@ int Bild::getAverageColor() const
          | ((((int)g) & 0xFF) << 8) | (((int)b) & 0xFF);
 }
 
-// Contents of the BildZ class from Image.h
+// Contents of the ImageView class from Image.h
 // Constructor
-BildZ::BildZ()
+ImageView::ImageView()
     : DrawableBackground(),
       bild(0)
 {
@@ -2931,17 +2931,17 @@ BildZ::BildZ()
 }
 
 // Destructor
-BildZ::~BildZ()
+ImageView::~ImageView()
 {
     if (bild) bild->release();
 }
 
-void BildZ::doMausEreignis(MausEreignis& me, bool userRet) // calls Mak
+void ImageView::doMausEreignis(MausEreignis& me, bool userRet) // calls Mak
 {
     if (userRet)
     {
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         bool vs = hatStyle(Style::VScroll) && vertikalScrollBar;
         bool hs = hatStyle(Style::HScroll) && horizontalScrollBar;
         if (vs)
@@ -2960,7 +2960,7 @@ void BildZ::doMausEreignis(MausEreignis& me, bool userRet) // calls Mak
 }
 
 // non-constant
-void BildZ::setBildZ(Bild* b) // sets the image
+void ImageView::setImageZ(Image* b) // sets the image
 {
     if (bild) bild->release();
     bild = b;
@@ -2974,11 +2974,11 @@ void BildZ::setBildZ(Bild* b) // sets the image
     rend = 1;
 }
 
-void BildZ::setBild(Bild* b)
+void ImageView::setImage(Image* b)
 {
-    if (!bild) bild = new Bild();
-    bild->neuBild(b->getBreite(), b->getHeight(), 0);
-    bild->drawBild(0, 0, b->getBreite(), b->getHeight(), *b);
+    if (!bild) bild = new Image();
+    bild->neuImage(b->getBreite(), b->getHeight(), 0);
+    bild->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
     if (!vertikalScrollBar) vertikalScrollBar = new VScrollBar();
     if (!horizontalScrollBar) horizontalScrollBar = new HScrollBar();
     horizontalScrollBar->getScrollData()->max = b->getBreite();
@@ -2987,12 +2987,12 @@ void BildZ::setBild(Bild* b)
     rend = 1;
 }
 
-bool BildZ::tick(double tickVal) // tick
+bool ImageView::tick(double tickVal) // tick
 {
     return DrawableBackground::tick(tickVal);
 }
 
-void BildZ::render(Bild& zRObj) // draws to zRObj
+void ImageView::render(Image& zRObj) // draws to zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -3015,16 +3015,16 @@ void BildZ::render(Bild& zRObj) // draws to zRObj
                 if (hatStyle(Style::Alpha))
                 {
                     if (hatStyle(Style::Skalliert))
-                        zRObj.alphaBildSkall(x, y, br, hi, *bild);
+                        zRObj.alphaImageSkall(x, y, br, hi, *bild);
                     else
-                        zRObj.alphaBild(x, y, br, hi, *bild);
+                        zRObj.alphaImage(x, y, br, hi, *bild);
                 }
                 else
                 {
                     if (hatStyle(Style::Skalliert))
-                        zRObj.drawBildSkall(x, y, br, hi, *bild);
+                        zRObj.drawImageSkall(x, y, br, hi, *bild);
                     else
-                        zRObj.drawBild(x, y, br, hi, *bild);
+                        zRObj.drawImage(x, y, br, hi, *bild);
                 }
             }
             else
@@ -3036,13 +3036,13 @@ void BildZ::render(Bild& zRObj) // draws to zRObj
                     return;
                 }
                 if (hatStyle(Style::Alpha))
-                    zRObj.alphaBild(-horizontalScrollBar->getScroll(),
+                    zRObj.alphaImage(-horizontalScrollBar->getScroll(),
                         -vertikalScrollBar->getScroll(),
                         bild->getBreite(),
                         bild->getHeight(),
                         *bild);
                 else
-                    zRObj.drawBild(-horizontalScrollBar->getScroll(),
+                    zRObj.drawImage(-horizontalScrollBar->getScroll(),
                         -vertikalScrollBar->getScroll(),
                         bild->getBreite(),
                         bild->getHeight(),
@@ -3056,20 +3056,20 @@ void BildZ::render(Bild& zRObj) // draws to zRObj
 }
 
 // constant
-Bild* BildZ::getBild() const // returns the image
+Image* ImageView::getImage() const // returns the image
 {
-    if (bild) return dynamic_cast<Bild*>(bild->getThis());
+    if (bild) return dynamic_cast<Image*>(bild->getThis());
     return 0;
 }
 
-Bild* BildZ::zBild() const
+Image* ImageView::zImage() const
 {
     return bild;
 }
 
-Drawable* BildZ::dublizieren() const // creates a copy of the drawing
+Drawable* ImageView::dublizieren() const // creates a copy of the drawing
 {
-    BildZ* obj = new BildZ();
+    ImageView* obj = new ImageView();
     obj->setPosition(pos);
     obj->setSize(gr);
     obj->setMausEreignisParameter(makParam);
@@ -3081,24 +3081,24 @@ Drawable* BildZ::dublizieren() const // creates a copy of the drawing
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
-    if (bild) obj->setBild(dynamic_cast<Bild*>(bild->getThis()));
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
+    if (bild) obj->setImage(dynamic_cast<Image*>(bild->getThis()));
     obj->setStyle(style);
     return obj;
 }
 
 #ifdef WIN32
-Bild* Framework::ladeBild(const char* pfad, Text* zError)
+Image* Framework::ladeImage(const char* pfad, Text* zError)
 {
     Text p = pfad;
     Text* txt = p.getTeilText(p.positionVon('.', p.anzahlVon('.') - 1));
     if (!(txt->istGleich(".bmp") || txt->istGleich(".jpg")
             || txt->istGleich(".gif") || txt->istGleich(".png")))
     {
-        zError->setText("Die Angegebene Datei ist keine gueltige Bilddatei!");
+        zError->setText("Die Angegebene Datei ist keine gueltige ImageFile!");
         txt->release();
         return 0;
     }
@@ -3112,8 +3112,8 @@ Bild* Framework::ladeBild(const char* pfad, Text* zError)
     Gdiplus::Color pix;
     delete[] name;
 
-    Bild* ret = new Bild();
-    ret->neuBild(bitmap.GetWidth(), bitmap.GetHeight(), 0);
+    Image* ret = new Image();
+    ret->neuImage(bitmap.GetWidth(), bitmap.GetHeight(), 0);
     int* buff = ret->getBuffer();
     for (unsigned int i = 0; i < bitmap.GetWidth() * bitmap.GetHeight(); i++)
     {

Image.h

@@ -1,5 +1,5 @@
-#ifndef Bild_H
-#define Bild_H
+#ifndef Image_H
+#define Image_H
 
 #include "Array.h"
 #include "Point.h"
@@ -7,18 +7,18 @@
 
 namespace Framework
 {
-    class Bild; //! from this file
+    class Image; //! from this file
 #ifdef WIN32
     class VScrollBar;    //! Scroll.h
     class HScrollBar;    //! Scroll.h
-    class Rahmen;        //! Border.h
+    class Border;        //! Border.h
     struct MausEreignis; //! MouseEvent.h
     class Text;          //! Text.h
 #endif
 
     //! Manages an image as an array of pixel colors in A8R8G8B8 format
     //! that can be drawn to
-    class Bild : public virtual ReferenceCounter
+    class Image : public virtual ReferenceCounter
     {
     private:
         int* fc;
@@ -58,7 +58,7 @@ namespace Framework
             double ty_2o,
             double txf,
             double tyf,
-            const Bild& textur);
+            const Image& textur);
         void drawFlatDreieckAlpha(
             int y1, int y2, float m1, float b1, float m2, float b2, int farbe);
         void drawFlatDreieckTexturAlpha(int y1,
@@ -77,21 +77,21 @@ namespace Framework
             double ty_2o,
             double txf,
             double tyf,
-            const Bild& textur);
+            const Image& textur);
         void drawLinieHTextur(Vec2<double> p,
             double length,
             Vec2<double> ta,
             Vec2<double> tb,
             double txo,
             double tyo,
-            const Bild& textur);
+            const Image& textur);
         void drawLinieHTexturAlpha(Vec2<double> p,
             double length,
             Vec2<double> ta,
             Vec2<double> tb,
             double txo,
             double tyo,
-            const Bild& textur);
+            const Image& textur);
 
     public:
         //! Constructor
@@ -99,9 +99,9 @@ namespace Framework
         //! such as for temporary drawing area boundaries and
         //! transparency filters
         //!  Uses about 50 kb more memory per image
-        DLLEXPORT Bild(bool options = 0);
+        DLLEXPORT Image(bool options = 0);
         //! Destructor
-        DLLEXPORT ~Bild();
+        DLLEXPORT ~Image();
         //! Checks whether a rectangle is fully or partially within the drawing
         //! area.
         //!  return 0 if the rectangle is not in the drawing area, 1 otherwise
@@ -128,7 +128,7 @@ namespace Framework
         //! \param breite The width of the image in pixels
         //! \param hoehe The height of the image in pixels
         //! \param fillColor The initial color all pixels are set to
-        DLLEXPORT void neuBild(int breite, int height, int fillColor);
+        DLLEXPORT void neuImage(int breite, int height, int fillColor);
         //! Blends a color onto a specific pixel using alpha blending.
         //! Does not respect the drawing area boundary or scroll offset
         //! \param x The X coordinate of the pixel
@@ -248,97 +248,97 @@ namespace Framework
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void drawBild(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void drawImage(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image into a specific area without scaling with alpha
         //! blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBild(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImage(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image into a specific area without scaling with associative
         //! alpha blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBildAssoz(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImageAssoz(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 90 degrees clockwise into a specific area
         //! without scaling
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void drawBild90(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void drawImage90(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 90 degrees clockwise into a specific area
         //! without scaling with alpha blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBild90(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImage90(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 180 degrees into a specific area
         //! without scaling
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void drawBild180(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void drawImage180(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 180 degrees into a specific area
         //! without scaling with alpha blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBild180(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImage180(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 270 degrees clockwise into a specific area
         //! without scaling
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void drawBild270(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void drawImage270(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image rotated 270 degrees clockwise into a specific area
         //! without scaling with alpha blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBild270(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImage270(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image into a specific area with scaling
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void drawBildSkall(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void drawImageSkall(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Draws an image into a specific area with scaling and alpha blending
         //! \param x The X coordinate of the top left corner of the target area
         //! \param y The Y coordinate of the top left corner of the target area
         //! \param br The width of the target area
         //! \param hi The height of the target area
-        //! \param zBild The image to be drawn
-        DLLEXPORT void alphaBildSkall(
-            int x, int y, int br, int hi, const Bild& zBild);
+        //! \param zImage The image to be drawn
+        DLLEXPORT void alphaImageSkall(
+            int x, int y, int br, int hi, const Image& zImage);
         //! Fills a triangle with a specific color
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
@@ -359,7 +359,7 @@ namespace Framework
             Punkt ta,
             Punkt tb,
             Punkt tc,
-            const Bild& textur);
+            const Image& textur);
         //! Fills a triangle with a specific color with alpha blending
         //! \param a A corner of the triangle
         //! \param b A corner of the triangle
@@ -380,7 +380,7 @@ namespace Framework
             Punkt ta,
             Punkt tb,
             Punkt tc,
-            const Bild& textur);
+            const Image& textur);
         //! Replaces a specific color with transparency
         DLLEXPORT void replaceColorWithAlpha(int color);
         //! Restricts the drawing area until the next call of
@@ -475,7 +475,7 @@ namespace Framework
     };
 
     //! A 2D GUI Framework drawing that displays an image.
-    class BildZ : public DrawableBackground
+    class ImageView : public DrawableBackground
     {
     public:
         class Style : public DrawableBackground::Style
@@ -488,13 +488,13 @@ namespace Framework
             static const __int64 Skalliert = 0x2000;
 
             //! The normal style of an image drawing consisting of HScroll,
-            //! Sichtbar, Erlaubt, Rahmen, VScroll
+            //! Sichtbar, Erlaubt, Border, VScroll
             static const __int64 normal
-                = HScroll | Sichtbar | Erlaubt | Rahmen | VScroll;
+                = HScroll | Sichtbar | Erlaubt | Border | VScroll;
         };
 
     private:
-        Bild* bild;
+        Image* bild;
 
     protected:
         //! Processes a mouse event. Called automatically by the framework.
@@ -503,15 +503,15 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT BildZ();
+        DLLEXPORT ImageView();
         //! Destructor
-        DLLEXPORT virtual ~BildZ();
+        DLLEXPORT virtual ~ImageView();
         //! Sets a pointer to the image to be displayed
         //! \param b The image
-        DLLEXPORT void setBildZ(Bild* b);
+        DLLEXPORT void setImageZ(Image* b);
         //! Sets the image to be displayed. The image content is copied
         //! \param b The image
-        DLLEXPORT void setBild(Bild* b);
+        DLLEXPORT void setImage(Image* b);
         //! Updates the drawing background
         //! \param tickVal The elapsed time in seconds since the last call
         //! of this function
@@ -519,11 +519,11 @@ namespace Framework
         DLLEXPORT bool tick(double tickVal) override;
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the displayed image
-        DLLEXPORT Bild* getBild() const;
+        DLLEXPORT Image* getImage() const;
         //! Returns the displayed image without increased reference counter
-        DLLEXPORT Bild* zBild() const;
+        DLLEXPORT Image* zImage() const;
         //! Copies the complete drawing so it can be modified without
         //! affecting the original
         DLLEXPORT Drawable* dublizieren() const override;
@@ -535,7 +535,7 @@ namespace Framework
     //! \param zError A pointer to a Text object where a possible error is
     //! returned
     //! \return The loaded image
-    DLLEXPORT Bild* ladeBild(const char* pfad, Text* zError);
+    DLLEXPORT Image* ladeImage(const char* pfad, Text* zError);
 #endif
 } // namespace Framework
 #endif

JsonEditor.cpp

@@ -1696,14 +1696,14 @@ JsonEditor::JsonEditor(UIInit uiInit)
     renderings = 0;
     renderedLines = 0;
     renderStopLine = 0;
-    errorDescription = uiInit.createTextFeld(uiInit.initParam);
-    errorDescription->setStyle(TextFeld::Style::Text | TextFeld::Style::Center
-                               | TextFeld::Style::Rahmen
-                               | TextFeld::Style::Hintergrund
-                               | TextFeld::Style::HAlpha);
-    errorDescription->removeStyle(TextFeld::Style::Sichtbar);
+    errorDescription = uiInit.createTextField(uiInit.initParam);
+    errorDescription->setStyle(TextField::Style::Text | TextField::Style::Center
+                               | TextField::Style::Border
+                               | TextField::Style::Hintergrund
+                               | TextField::Style::HAlpha);
+    errorDescription->removeStyle(TextField::Style::Sichtbar);
     errorDescription->setSchriftFarbe(0xFFFFFFFF);
-    errorDescription->setRahmenFarbe(0xFFA0A0A0);
+    errorDescription->setBorderColor(0xFFA0A0A0);
     errorDescription->setHintergrundFarbe(0xA0000000);
     hasSyntaxError = false;
 }
@@ -2056,9 +2056,9 @@ void Framework::JSON::JsonEditor::fixTree(EditableJsonElement* zElement)
     }
 }
 
-void Framework::JSON::JsonEditor::setFont(Schrift* schrift)
+void Framework::JSON::JsonEditor::setFont(Font* schrift)
 {
-    textRenderer->setSchriftZ(schrift);
+    textRenderer->setFontZ(schrift);
 }
 
 void Framework::JSON::JsonEditor::setFontSize(int size)
@@ -2675,16 +2675,16 @@ bool Framework::JSON::JsonEditor::tick(double tickVal)
     return DrawableBackground::tick(tickVal);
 }
 
-void Framework::JSON::JsonEditor::render(Bild& rObj)
+void Framework::JSON::JsonEditor::render(Image& rObj)
 {
     LOCK(&cs);
     renderings++;
     renderedLines = 0;
-    errorDescription->removeStyle(TextFeld::Style::Sichtbar);
+    errorDescription->removeStyle(TextField::Style::Sichtbar);
     DrawableBackground::render(rObj);
-    if (textRenderer->zSchrift() && content
+    if (textRenderer->zFont() && content
         && rObj.setDrawOptions(
-            pos + Punkt(getRahmenBreite(), getRahmenBreite()),
+            pos + Punkt(getBorderWidth(), getBorderWidth()),
             Punkt(getInnenBreite(), getInnenHeight())))
     {
         if (!renderStart.line)
@@ -2864,7 +2864,7 @@ void Framework::JSON::JsonEditor::render(Bild& rObj)
                                 getInnenHeight() - errorDescription->getHeight()
                                 - 5);
                         }
-                        errorDescription->addStyle(TextFeld::Style::Sichtbar);
+                        errorDescription->addStyle(TextField::Style::Sichtbar);
                     }
                 }
                 if (column % 4 == 0 && content[i] == ' ' && whiteSpaceOnly)

JsonEditor.h

@@ -11,7 +11,7 @@
 namespace Framework
 {
     class TextRenderer;
-    class TextFeld;
+    class TextField;
 
     namespace JSON
     {
@@ -198,7 +198,7 @@ namespace Framework
             EditorPosition selectionEnd;
             EditorPosition lastClickCursorPos;
             TextRenderer* textRenderer;
-            TextFeld* errorDescription;
+            TextField* errorDescription;
             int renderStartLine;
             int renderStopLine;
             int lineCount;
@@ -232,7 +232,7 @@ namespace Framework
             DLLEXPORT void fixTree(EditableJsonElement* zElement);
 
         public:
-            DLLEXPORT void setFont(Schrift* schrift);
+            DLLEXPORT void setFont(Font* schrift);
             DLLEXPORT void setFontSize(int size);
             DLLEXPORT void setContent(Text content);
             DLLEXPORT void setContent(JSONValue* content);
@@ -249,7 +249,7 @@ namespace Framework
             //! redrawn. 0 otherwise
             DLLEXPORT bool tick(double tickVal) override;
             //! Draws the background of a drawing to rObj
-            DLLEXPORT void render(Bild& rObj) override;
+            DLLEXPORT void render(Image& rObj) override;
 
             DLLEXPORT Text getContent();
             DLLEXPORT Text getSelectedContent();

KeyboardEvent.h

@@ -22,8 +22,8 @@ namespace Framework
     const unsigned char T_Caps_Lock = VK_CAPITAL;
     const unsigned char T_Esc = VK_ESCAPE;
     const unsigned char T_Space = VK_SPACE;
-    const unsigned char T_BildO = VK_PRIOR;
-    const unsigned char T_BildU = VK_NEXT;
+    const unsigned char T_ImageO = VK_PRIOR;
+    const unsigned char T_ImageU = VK_NEXT;
     const unsigned char T_Ende = VK_END;
     const unsigned char T_Pos1 = VK_HOME;
     const unsigned char T_Links = VK_LEFT;
@@ -58,8 +58,8 @@ namespace Framework
     const unsigned char T_Caps_Lock = 0x14;
     const unsigned char T_Esc = 0x1B;
     const unsigned char T_Space = 0x20;
-    const unsigned char T_BildO = 0x21;
-    const unsigned char T_BildU = 0x22;
+    const unsigned char T_ImageO = 0x21;
+    const unsigned char T_ImageU = 0x22;
     const unsigned char T_Ende = 0x23;
     const unsigned char T_Pos1 = 0x24;
     const unsigned char T_Links = 0x25;

List.cpp

@@ -21,14 +21,14 @@ AuswahlListe::AuswahlListe()
       tfListe(0),
       auswahl(-1),
       ahFarbe(0xFF000000),
-      ahBild(0),
+      ahImage(0),
       aBuffer(0),
-      aRahmen(0),
+      aBorder(0),
       styles(0),
       ahFarbeListe(0),
-      ahBildListe(0),
+      ahImageListe(0),
       aBufferListe(0),
-      aRahmenListe(0),
+      aBorderList(0),
       schrift(0)
 {
     style = 0;
@@ -40,14 +40,14 @@ AuswahlListe::AuswahlListe()
 AuswahlListe::~AuswahlListe()
 {
     if (tfListe) tfListe->release();
-    if (ahBild) ahBild->release();
+    if (ahImage) ahImage->release();
     if (aBuffer) aBuffer->release();
-    if (aRahmen) aRahmen->release();
+    if (aBorder) aBorder->release();
     if (styles) styles->release();
     if (ahFarbeListe) ahFarbeListe->release();
-    if (ahBildListe) ahBildListe->release();
+    if (ahImageListe) ahImageListe->release();
     if (aBufferListe) aBufferListe->release();
-    if (aRahmenListe) aRahmenListe->release();
+    if (aBorderList) aBorderList->release();
     if (schrift) schrift->release();
 }
 
@@ -57,7 +57,7 @@ void AuswahlListe::doMausEreignis(MausEreignis& me, bool userRet)
     if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
     {
         int rbr = 0;
-        if (rahmen && DrawableBackground::hatStyle(Style::Rahmen))
+        if (rahmen && DrawableBackground::hatStyle(Style::Border))
             rbr = rahmen->getRBreite();
         if (((me.mx > gr.x - 15 - rbr) || me.id == ME_UScroll
                 || me.id == ME_DScroll)
@@ -140,21 +140,21 @@ void AuswahlListe::update() // updates the selection list
     }
     if (hatStyleNicht(Style::MultiStyled) && tfListe)
     {
-        bool FeldRahmen = DrawableBackground::hatStyle(Style::FeldRahmen);
+        bool FieldBorder = DrawableBackground::hatStyle(Style::FieldBorder);
         bool FeldHintergrund
             = DrawableBackground::hatStyle(Style::FeldHintergrund);
-        bool FeldHBild = DrawableBackground::hatStyle(Style::FeldHBild);
+        bool FeldHImage = DrawableBackground::hatStyle(Style::FeldHImage);
         bool FeldHAlpha = DrawableBackground::hatStyle(Style::FeldHAlpha);
         bool FeldBuffer = DrawableBackground::hatStyle(Style::FeldBuffer);
-        for (TextFeld* tf : *tfListe)
+        for (TextField* tf : *tfListe)
         {
-            tf->setStyle(TextFeld::Style::Rahmen, FeldRahmen);
-            tf->setStyle(TextFeld::Style::Hintergrund, FeldHintergrund);
-            tf->setStyle(TextFeld::Style::HBild, FeldHBild);
-            tf->setStyle(TextFeld::Style::HAlpha, FeldHAlpha);
-            tf->setStyle(TextFeld::Style::Buffered, FeldBuffer);
+            tf->setStyle(TextField::Style::Border, FieldBorder);
+            tf->setStyle(TextField::Style::Hintergrund, FeldHintergrund);
+            tf->setStyle(TextField::Style::HImage, FeldHImage);
+            tf->setStyle(TextField::Style::HAlpha, FeldHAlpha);
+            tf->setStyle(TextField::Style::Buffered, FeldBuffer);
             if (schrift)
-                tf->setSchriftZ(dynamic_cast<Schrift*>(schrift->getThis()));
+                tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
         }
     }
     if (DrawableBackground::hatStyle(Style::MultiStyled) && tfListe && styles)
@@ -163,15 +163,15 @@ void AuswahlListe::update() // updates the selection list
         for (auto tf = tfListe->begin(); tf; tf++, style++)
         {
             tf->setStyle(
-                TextFeld::Style::Rahmen, hatStyle(style, Style::FeldRahmen));
-            tf->setStyle(TextFeld::Style::Hintergrund,
+                TextField::Style::Border, hatStyle(style, Style::FieldBorder));
+            tf->setStyle(TextField::Style::Hintergrund,
                 hatStyle(style, Style::FeldHintergrund));
             tf->setStyle(
-                TextFeld::Style::HBild, hatStyle(style, Style::FeldHBild));
+                TextField::Style::HImage, hatStyle(style, Style::FeldHImage));
             tf->setStyle(
-                TextFeld::Style::HAlpha, hatStyle(style, Style::FeldHAlpha));
+                TextField::Style::HAlpha, hatStyle(style, Style::FeldHAlpha));
             tf->setStyle(
-                TextFeld::Style::Buffered, hatStyle(style, Style::FeldBuffer));
+                TextField::Style::Buffered, hatStyle(style, Style::FeldBuffer));
         }
     }
     rend = 1;
@@ -179,12 +179,12 @@ void AuswahlListe::update() // updates the selection list
 
 void AuswahlListe::addEintrag(Text* txt) // adds an entry
 {
-    TextFeld* tf = new TextFeld();
-    tf->setStyle(TextFeld::Style::Center | TextFeld::Style::Sichtbar
-                 | TextFeld::Style::Rahmen);
+    TextField* tf = new TextField();
+    tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+                 | TextField::Style::Border);
     tf->setSchriftFarbe(0xFFFFFFFF);
-    tf->setRahmenBreite(1);
-    tf->setRahmenFarbe(0xFFFFFFFF);
+    tf->setBorderWidth(1);
+    tf->setBorderColor(0xFFFFFFFF);
     tf->setTextZ(txt);
     tf->setSize(0, 20);
     addEintragZ(tf);
@@ -198,11 +198,11 @@ void AuswahlListe::addEintrag(const char* txt)
     rend = 1;
 }
 
-void AuswahlListe::addEintragZ(TextFeld* tf)
+void AuswahlListe::addEintragZ(TextField* tf)
 {
-    if (!tfListe) tfListe = new RCArray<TextFeld>();
-    if (schrift && (!tf->zSchrift() || hatStyleNicht(Style::MultiStyled)))
-        tf->setSchriftZ(dynamic_cast<Schrift*>(schrift->getThis()));
+    if (!tfListe) tfListe = new RCArray<TextField>();
+    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
     tfListe->add(tf);
     rend = 1;
 }
@@ -210,12 +210,12 @@ void AuswahlListe::addEintragZ(TextFeld* tf)
 void AuswahlListe::addEintrag(
     int pos, Text* txt) // inserts an entry at position pos
 {
-    TextFeld* tf = new TextFeld();
-    tf->setStyle(TextFeld::Style::Center | TextFeld::Style::Sichtbar
-                 | TextFeld::Style::Rahmen);
+    TextField* tf = new TextField();
+    tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+                 | TextField::Style::Border);
     tf->setSchriftFarbe(0xFFFFFFFF);
-    tf->setRahmenBreite(1);
-    tf->setRahmenFarbe(0xFFFFFFFF);
+    tf->setBorderWidth(1);
+    tf->setBorderColor(0xFFFFFFFF);
     tf->setTextZ(txt);
     tf->setSize(0, 20);
     addEintragZ(pos, tf);
@@ -229,11 +229,11 @@ void AuswahlListe::addEintrag(int pos, const char* txt)
     rend = 1;
 }
 
-void AuswahlListe::addEintragZ(int pos, TextFeld* tf)
+void AuswahlListe::addEintragZ(int pos, TextField* tf)
 {
-    if (!tfListe) tfListe = new RCArray<TextFeld>();
-    if (schrift && (!tf->zSchrift() || hatStyleNicht(Style::MultiStyled)))
-        tf->setSchriftZ(dynamic_cast<Schrift*>(schrift->getThis()));
+    if (!tfListe) tfListe = new RCArray<TextField>();
+    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
     tfListe->add(tf, pos);
     rend = 1;
 }
@@ -241,16 +241,16 @@ void AuswahlListe::addEintragZ(int pos, TextFeld* tf)
 void AuswahlListe::setEintrag(
     int pos, Text* txt) // changes the entry at pos
 {
-    TextFeld* tf = 0;
+    TextField* tf = 0;
     if (tfListe) tf = tfListe->z(pos);
     if (!tf)
     {
-        tf = new TextFeld();
-        tf->setStyle(TextFeld::Style::Center | TextFeld::Style::Sichtbar
-                     | TextFeld::Style::Rahmen);
+        tf = new TextField();
+        tf->setStyle(TextField::Style::Center | TextField::Style::Sichtbar
+                     | TextField::Style::Border);
         tf->setSchriftFarbe(0xFFFFFFFF);
-        tf->setRahmenFarbe(0xFFFFFFFF);
-        tf->setRahmenBreite(1);
+        tf->setBorderColor(0xFFFFFFFF);
+        tf->setBorderWidth(1);
         tf->setTextZ(txt);
         tf->setSize(0, 20);
         setEintragZ(pos, tf);
@@ -268,11 +268,11 @@ void AuswahlListe::setEintrag(int pos, const char* txt)
     rend = 1;
 }
 
-void AuswahlListe::setEintragZ(int pos, TextFeld* tf)
+void AuswahlListe::setEintragZ(int pos, TextField* tf)
 {
-    if (!tfListe) tfListe = new RCArray<TextFeld>();
-    if (schrift && (!tf->zSchrift() || hatStyleNicht(Style::MultiStyled)))
-        tf->setSchriftZ(dynamic_cast<Schrift*>(schrift->getThis()));
+    if (!tfListe) tfListe = new RCArray<TextField>();
+    if (schrift && (!tf->zFont() || hatStyleNicht(Style::MultiStyled)))
+        tf->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
     tfListe->set(tf, pos);
     rend = 1;
 }
@@ -285,9 +285,9 @@ void AuswahlListe::tauschEintragPos(
         tfListe->tausch(vpos, npos);
         if (styles) styles->tausch(vpos, npos);
         if (ahFarbeListe) ahFarbeListe->tausch(vpos, npos);
-        if (ahBildListe) ahBildListe->tausch(vpos, npos);
+        if (ahImageListe) ahImageListe->tausch(vpos, npos);
         if (aBufferListe) aBufferListe->tausch(vpos, npos);
-        if (aRahmenListe) aRahmenListe->tausch(vpos, npos);
+        if (aBorderList) aBorderList->tausch(vpos, npos);
         rend = 1;
     }
 }
@@ -298,9 +298,9 @@ void Framework::AuswahlListe::setEintragPos(int vpos, int npos) {
         tfListe->setPosition(vpos, npos);
         if (styles) styles->setPosition(vpos, npos);
         if (ahFarbeListe) ahFarbeListe->setPosition(vpos, npos);
-        if (ahBildListe) ahBildListe->setPosition(vpos, npos);
+        if (ahImageListe) ahImageListe->setPosition(vpos, npos);
         if (aBufferListe) aBufferListe->setPosition(vpos, npos);
-        if (aRahmenListe) aRahmenListe->setPosition(vpos, npos);
+        if (aBorderList) aBorderList->setPosition(vpos, npos);
         rend = 1;
     }
 }
@@ -311,8 +311,8 @@ void AuswahlListe::removeEintrag(int pos) // deletes entry at pos
     rend = 1;
 }
 
-void AuswahlListe::setSchriftZ(
-    Schrift* schrift) // sets the font for the entries
+void AuswahlListe::setFontZ(
+    Font* schrift) // sets the font for the entries
 {
     if (this->schrift) this->schrift->release();
     this->schrift = schrift;
@@ -338,39 +338,39 @@ void AuswahlListe::updateVScroll() // scrolls to cursor position or
     if (vertikalScrollBar)
     {
         int y = 0;
-        for (TextFeld* tf : *tfListe)
-            y += (TextFeld*)tf ? tf->getHeight() : 0;
+        for (TextField* tf : *tfListe)
+            y += (TextField*)tf ? tf->getHeight() : 0;
         vertikalScrollBar->update(y,
             gr.y
                 - ((rahmen
                        && DrawableBackground::hatStyle(
-                           TextFeld::Style::Rahmen))
+                           TextField::Style::Border))
                         ? rahmen->getRBreite()
                         : 0));
     }
 }
 
-void AuswahlListe::setALRZ(Rahmen*
+void AuswahlListe::setALRZ(Border*
         rahmen) // sets a pointer to the selection border (only without MultiStyled)
 {
-    if (aRahmen) aRahmen->release();
-    aRahmen = rahmen;
+    if (aBorder) aBorder->release();
+    aBorder = rahmen;
     rend = 1;
 }
 
 void AuswahlListe::setALRBreite(
     int br) // sets the width of the selection border (only without MultiStyled)
 {
-    if (!aRahmen) aRahmen = new LRahmen();
-    aRahmen->setRamenBreite(br);
+    if (!aBorder) aBorder = new LBorder();
+    aBorder->setRamenBreite(br);
     rend = 1;
 }
 
 void AuswahlListe::setALRFarbe(
     int fc) // sets the color of the selection border (only without MultiStyled)
 {
-    if (!aRahmen) aRahmen = new LRahmen();
-    aRahmen->setFarbe(fc);
+    if (!aBorder) aBorder = new LBorder();
+    aBorder->setFarbe(fc);
     rend = 1;
 }
 
@@ -400,12 +400,12 @@ void AuswahlListe::setAAFFarbe(
     rend = 1;
 }
 
-void AuswahlListe::setAHBild(
-    Bild* bild) // sets the selection background image (only without MultiStyled)
+void AuswahlListe::setAHImage(
+    Image* bild) // sets the selection background image (only without MultiStyled)
 {
-    if (!ahBild) ahBild = new Bild();
-    ahBild->neuBild(bild->getBreite(), bild->getHeight(), 0);
-    int* buff1 = ahBild->getBuffer();
+    if (!ahImage) ahImage = new Image();
+    ahImage->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    int* buff1 = ahImage->getBuffer();
     int* buff2 = bild->getBuffer();
     for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
@@ -420,38 +420,38 @@ void AuswahlListe::setAHFarbe(int f) // sets the selection
     rend = 1;
 }
 
-void AuswahlListe::setAHBildZ(
-    Bild* b) // sets a pointer to the background image (only without MultiStyled)
+void AuswahlListe::setAHImageZ(
+    Image* b) // sets a pointer to the background image (only without MultiStyled)
 {
-    if (ahBild) ahBild->release();
-    ahBild = b;
+    if (ahImage) ahImage->release();
+    ahImage = b;
     rend = 1;
 }
 
 void AuswahlListe::setALRZ(int pos,
-    Rahmen*
+    Border*
         rahmen) // sets a pointer to the selection border (only with MultiStyled)
 {
-    if (!aRahmenListe) aRahmenListe = new RCArray<Rahmen>();
-    aRahmenListe->set(rahmen, pos);
+    if (!aBorderList) aBorderList = new RCArray<Border>();
+    aBorderList->set(rahmen, pos);
     rend = 1;
 }
 
 void AuswahlListe::setALRBreite(int pos,
     int br) // sets the width of the selection border (only with MultiStyled)
 {
-    if (!aRahmenListe) aRahmenListe = new RCArray<Rahmen>();
-    if (!aRahmenListe->z(pos)) aRahmenListe->set(new LRahmen(), pos);
-    aRahmenListe->z(pos)->setRamenBreite(br);
+    if (!aBorderList) aBorderList = new RCArray<Border>();
+    if (!aBorderList->z(pos)) aBorderList->set(new LBorder(), pos);
+    aBorderList->z(pos)->setRamenBreite(br);
     rend = 1;
 }
 
 void AuswahlListe::setALRFarbe(int pos,
     int fc) // sets the color of the selection border (only with MultiStyled)
 {
-    if (!aRahmenListe) aRahmenListe = new RCArray<Rahmen>();
-    if (!aRahmenListe->z(pos)) aRahmenListe->set(new LRahmen(), pos);
-    aRahmenListe->z(pos)->setFarbe(fc);
+    if (!aBorderList) aBorderList = new RCArray<Border>();
+    if (!aBorderList->z(pos)) aBorderList->set(new LBorder(), pos);
+    aBorderList->z(pos)->setFarbe(fc);
     rend = 1;
 }
 
@@ -484,13 +484,13 @@ void AuswahlListe::setAAFFarbe(
     rend = 1;
 }
 
-void AuswahlListe::setAHBild(int pos,
-    Bild* bild) // sets the selection background image (only with MultiStyled)
+void AuswahlListe::setAHImage(int pos,
+    Image* bild) // sets the selection background image (only with MultiStyled)
 {
-    if (ahBildListe) ahBildListe = new RCArray<Bild>();
-    if (!ahBildListe->z(pos)) ahBildListe->set(new Bild(), pos);
-    ahBildListe->z(pos)->neuBild(bild->getBreite(), bild->getHeight(), 0);
-    int* buff1 = ahBildListe->z(pos)->getBuffer();
+    if (ahImageListe) ahImageListe = new RCArray<Image>();
+    if (!ahImageListe->z(pos)) ahImageListe->set(new Image(), pos);
+    ahImageListe->z(pos)->neuImage(bild->getBreite(), bild->getHeight(), 0);
+    int* buff1 = ahImageListe->z(pos)->getBuffer();
     int* buff2 = bild->getBuffer();
     for (int i = 0; i < bild->getBreite() * bild->getHeight(); ++i)
         buff1[i] = buff2[i];
@@ -507,11 +507,11 @@ void AuswahlListe::setAHFarbe(
     rend = 1;
 }
 
-void AuswahlListe::setAHBildZ(int pos,
-    Bild* b) // sets a pointer to the background image (only with MultiStyled)
+void AuswahlListe::setAHImageZ(int pos,
+    Image* b) // sets a pointer to the background image (only with MultiStyled)
 {
-    if (ahBildListe) ahBildListe = new RCArray<Bild>();
-    ahBildListe->set(b, pos);
+    if (ahImageListe) ahImageListe = new RCArray<Image>();
+    ahImageListe->set(b, pos);
     rend = 1;
 }
 
@@ -602,7 +602,7 @@ void AuswahlListe::doTastaturEreignis(TastaturEreignis& te)
     release();
 }
 
-void AuswahlListe::render(Bild& zRObj) // draws to zRObj
+void AuswahlListe::render(Image& zRObj) // draws to zRObj
 {
     if (!DrawableBackground::hatStyle(Style::Sichtbar)) return;
     removeStyle(Style::HScroll);
@@ -614,7 +614,7 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
         return;
     }
     int rbr = 0;
-    if (rahmen && DrawableBackground::hatStyle(Style::Rahmen))
+    if (rahmen && DrawableBackground::hatStyle(Style::Border))
         rbr = rahmen->getRBreite();
     if (tfListe)
     {
@@ -643,10 +643,10 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
             bool tmpB = 0;
             int tmpHFarbe = 0;
             bool tmpH = 0;
-            Bild* tmpHBild = 0;
+            Image* tmpHImage = 0;
             bool tmpHB = 0;
             bool tmpHAlpha = 0;
-            Rahmen* tmpRahmen = 0;
+            Border* tmpBorder = 0;
             bool tmpR = 0;
             if (selected)
             {
@@ -658,48 +658,48 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
                         tmpBuffer = tf->getAlphaFeld();
                         tf->setAlphaFeldZ(
                             dynamic_cast<AlphaFeld*>(aBuffer->getThis()));
-                        tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                        tf->setStyle(TextFeld::Style::Buffered,
+                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tf->setStyle(TextField::Style::Buffered,
                             DrawableBackground::hatStyle(
                                 Style::AuswahlBuffer));
                     }
                     if (DrawableBackground::hatStyle(
                             Style::AuswahlHintergrund))
                     {
-                        tmpH = tf->hatStyle(TextFeld::Style::Hintergrund);
+                        tmpH = tf->hatStyle(TextField::Style::Hintergrund);
                         tmpHFarbe = tf->getHintergrundFarbe();
                         tf->setHintergrundFarbe(ahFarbe);
-                        tf->setStyle(TextFeld::Style::Hintergrund,
+                        tf->setStyle(TextField::Style::Hintergrund,
                             DrawableBackground::hatStyle(Style::Hintergrund));
-                        if (DrawableBackground::hatStyle(Style::AuswahlHBild)
-                            && ahBild)
+                        if (DrawableBackground::hatStyle(Style::AuswahlHImage)
+                            && ahImage)
                         {
-                            tmpHBild = tf->getHintergrundBild();
-                            tf->setHintergrundBildZ(
-                                dynamic_cast<Bild*>(ahBild->getThis()));
-                            tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                            tf->setStyle(TextFeld::Style::HBild,
-                                DrawableBackground::hatStyle(Style::HBild));
+                            tmpHImage = tf->getHintergrundImage();
+                            tf->setHintergrundImageZ(
+                                dynamic_cast<Image*>(ahImage->getThis()));
+                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tf->setStyle(TextField::Style::HImage,
+                                DrawableBackground::hatStyle(Style::HImage));
                         }
                         if (DrawableBackground::hatStyle(
                                 Style::AuswahlHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextFeld::Style::HAlpha);
-                            tf->setStyle(TextFeld::Style::HAlpha,
+                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tf->setStyle(TextField::Style::HAlpha,
                                 DrawableBackground::hatStyle(
                                     Style::AuswahlHAlpha));
                         }
                     }
-                    if (DrawableBackground::hatStyle(Style::AuswahlRahmen)
-                        && aRahmen)
+                    if (DrawableBackground::hatStyle(Style::SelectionBorder)
+                        && aBorder)
                     {
-                        tmpRahmen = tf->getRahmen();
-                        tf->setRahmenZ(
-                            dynamic_cast<Rahmen*>(aRahmen->getThis()));
-                        tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen,
+                        tmpBorder = tf->getBorder();
+                        tf->setBorderZ(
+                            dynamic_cast<Border*>(aBorder->getThis()));
+                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tf->setStyle(TextField::Style::Border,
                             DrawableBackground::hatStyle(
-                                Style::AuswahlRahmen));
+                                Style::SelectionBorder));
                     }
                 }
                 else
@@ -708,42 +708,42 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
                     {
                         tmpBuffer = tf->getAlphaFeld();
                         tf->setAlphaFeldZ(aBufferListe->get(i));
-                        tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                        tf->setStyle(TextFeld::Style::Buffered,
+                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tf->setStyle(TextField::Style::Buffered,
                             hatStyle(style, Style::AuswahlBuffer));
                     }
                     if (hatStyle(style, Style::AuswahlHintergrund))
                     {
                         tmpH = tf->hatStyle(Style::Hintergrund);
-                        tf->setStyle(TextFeld::Style::Hintergrund,
+                        tf->setStyle(TextField::Style::Hintergrund,
                             hatStyle(style, Style::AuswahlHintergrund));
                         if (ahFarbeListe && ahFarbeListe->hat(i))
                         {
                             tmpHFarbe = tf->getHintergrundFarbe();
                             tf->setHintergrundFarbe(ahFarbeListe->get(i));
                         }
-                        if (hatStyle(style, Style::AuswahlHBild) && ahBildListe)
+                        if (hatStyle(style, Style::AuswahlHImage) && ahImageListe)
                         {
-                            tmpHBild = tf->getHintergrundBild();
-                            tf->setHintergrundBildZ(ahBildListe->get(i));
-                            tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                            tf->setStyle(TextFeld::Style::HBild,
-                                hatStyle(style, Style::HBild));
+                            tmpHImage = tf->getHintergrundImage();
+                            tf->setHintergrundImageZ(ahImageListe->get(i));
+                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tf->setStyle(TextField::Style::HImage,
+                                hatStyle(style, Style::HImage));
                         }
                         if (hatStyle(style, Style::AuswahlHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextFeld::Style::HAlpha);
-                            tf->setStyle(TextFeld::Style::HAlpha,
+                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tf->setStyle(TextField::Style::HAlpha,
                                 hatStyle(style, Style::AuswahlHAlpha));
                         }
                     }
-                    if (hatStyle(style, Style::AuswahlRahmen) && aRahmenListe)
+                    if (hatStyle(style, Style::SelectionBorder) && aBorderList)
                     {
-                        tmpRahmen = tf->getRahmen();
-                        tf->setRahmenZ(aRahmenListe->get(i));
-                        tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen,
-                            hatStyle(style, Style::AuswahlRahmen));
+                        tmpBorder = tf->getBorder();
+                        tf->setBorderZ(aBorderList->get(i));
+                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tf->setStyle(TextField::Style::Border,
+                            hatStyle(style, Style::SelectionBorder));
                     }
                 }
             }
@@ -755,26 +755,26 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
                     if (DrawableBackground::hatStyle(Style::AuswahlBuffer))
                     {
                         tf->setAlphaFeldZ(tmpBuffer);
-                        tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                        tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (DrawableBackground::hatStyle(
                             Style::AuswahlHintergrund))
                     {
                         tf->setHintergrundFarbe(tmpHFarbe);
-                        tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
-                        if (DrawableBackground::hatStyle(Style::AuswahlHBild))
+                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
+                        if (DrawableBackground::hatStyle(Style::AuswahlHImage))
                         {
-                            tf->setHintergrundBildZ(tmpHBild);
-                            tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
                         if (DrawableBackground::hatStyle(
                                 Style::AuswahlHAlpha))
-                            tf->setStyle(TextFeld::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (DrawableBackground::hatStyle(Style::AuswahlRahmen))
+                    if (DrawableBackground::hatStyle(Style::SelectionBorder))
                     {
-                        tf->setRahmenZ(tmpRahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                        tf->setBorderZ(tmpBorder);
+                        tf->setStyle(TextField::Style::Border, tmpR);
                     }
                 }
                 else
@@ -782,25 +782,25 @@ void AuswahlListe::render(Bild& zRObj) // draws to zRObj
                     if (hatMsStyle(i, Style::AuswahlBuffer) && aBufferListe)
                     {
                         tf->setAlphaFeldZ(tmpBuffer);
-                        tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                        tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatMsStyle(i, Style::AuswahlHintergrund))
                     {
-                        tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
+                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
                         if (ahFarbeListe && ahFarbeListe->hat(i))
                             tf->setHintergrundFarbe(tmpHFarbe);
-                        if (hatMsStyle(i, Style::AuswahlHBild) && ahBildListe)
+                        if (hatMsStyle(i, Style::AuswahlHImage) && ahImageListe)
                         {
-                            tf->setHintergrundBildZ(tmpHBild);
-                            tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
                         if (hatMsStyle(i, Style::AuswahlHAlpha))
-                            tf->setStyle(TextFeld::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatMsStyle(i, Style::AuswahlRahmen) && aRahmenListe)
+                    if (hatMsStyle(i, Style::SelectionBorder) && aBorderList)
                     {
-                        tf->setRahmenZ(tmpRahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                        tf->setBorderZ(tmpBorder);
+                        tf->setStyle(TextField::Style::Border, tmpR);
                     }
                 }
             }
@@ -880,31 +880,31 @@ int AuswahlListe::getEintragPos(
     return -1;
 }
 
-TextFeld* AuswahlListe::getEintrag(
+TextField* AuswahlListe::getEintrag(
     int pos) const // returns the entry at position pos
 {
     if (!tfListe) return 0;
-    TextFeld* ret = (TextFeld*)tfListe->get(pos);
-    if (ret) return dynamic_cast<TextFeld*>(ret->getThis());
+    TextField* ret = (TextField*)tfListe->get(pos);
+    if (ret) return dynamic_cast<TextField*>(ret->getThis());
     return 0;
 }
 
-TextFeld* AuswahlListe::zEintrag(int pos) const
+TextField* AuswahlListe::zEintrag(int pos) const
 {
     if (!tfListe) return 0;
-    return (TextFeld*)tfListe->z(pos);
+    return (TextField*)tfListe->z(pos);
 }
 
-Rahmen* AuswahlListe::getARahmen()
+Border* AuswahlListe::getABorder()
     const // returns the selection border (without MultiStyled)
 {
-    if (aRahmen) return dynamic_cast<Rahmen*>(aRahmen->getThis());
+    if (aBorder) return dynamic_cast<Border*>(aBorder->getThis());
     return 0;
 }
 
-Rahmen* AuswahlListe::zARahmen() const
+Border* AuswahlListe::zABorder() const
 {
-    return aRahmen;
+    return aBorder;
 }
 
 int AuswahlListe::getAHFarbe()
@@ -913,16 +913,16 @@ int AuswahlListe::getAHFarbe()
     return ahFarbe;
 }
 
-Bild* AuswahlListe::getAHBild()
+Image* AuswahlListe::getAHImage()
     const // returns the selection background image (without MultiStyled)
 {
-    if (ahBild) return dynamic_cast<Bild*>(ahBild->getThis());
+    if (ahImage) return dynamic_cast<Image*>(ahImage->getThis());
     return 0;
 }
 
-Bild* AuswahlListe::zAHBild() const
+Image* AuswahlListe::zAHImage() const
 {
-    return ahBild;
+    return ahImage;
 }
 
 AlphaFeld* AuswahlListe::getABuffer()
@@ -937,19 +937,19 @@ AlphaFeld* AuswahlListe::zABuffer() const
     return aBuffer;
 }
 
-Rahmen* AuswahlListe::getARahmen(
+Border* AuswahlListe::getABorder(
     int pos) const // returns the selection border (with MultiStyled)
 {
-    Rahmen* ret = 0;
-    if (aRahmenListe) ret = (Rahmen*)aRahmenListe->get(pos);
-    if (ret) return dynamic_cast<Rahmen*>(ret->getThis());
+    Border* ret = 0;
+    if (aBorderList) ret = (Border*)aBorderList->get(pos);
+    if (ret) return dynamic_cast<Border*>(ret->getThis());
     return 0;
 }
 
-Rahmen* AuswahlListe::zARahmen(int pos) const
+Border* AuswahlListe::zABorder(int pos) const
 {
-    Rahmen* ret = 0;
-    if (aRahmenListe) ret = (Rahmen*)aRahmenListe->z(pos);
+    Border* ret = 0;
+    if (aBorderList) ret = (Border*)aBorderList->z(pos);
     return ret;
 }
 
@@ -960,19 +960,19 @@ int AuswahlListe::getAHFarbe(int pos)
     return 0;
 }
 
-Bild* AuswahlListe::getAHBild(
+Image* AuswahlListe::getAHImage(
     int pos) const // returns the selection background image (with MultiStyled)
 {
-    Bild* ret = 0;
-    if (ahBildListe) ret = (Bild*)ahBildListe->get(pos);
-    if (ret) return dynamic_cast<Bild*>(ret->getThis());
+    Image* ret = 0;
+    if (ahImageListe) ret = (Image*)ahImageListe->get(pos);
+    if (ret) return dynamic_cast<Image*>(ret->getThis());
     return 0;
 }
 
-Bild* AuswahlListe::zAHBild(int pos) const
+Image* AuswahlListe::zAHImage(int pos) const
 {
-    Bild* ret = 0;
-    if (ahBildListe) ret = (Bild*)ahBildListe->z(pos);
+    Image* ret = 0;
+    if (ahImageListe) ret = (Image*)ahImageListe->z(pos);
     return ret;
 }
 
@@ -1014,8 +1014,8 @@ ZListe::ZListe()
 {
     entrySeperatorSize = 1;
     entrySeperatorColor = 0xFFFFFFFF;
-    setRahmenBreite(1);
-    setRahmenFarbe(0xFFFFFFFF);
+    setBorderWidth(1);
+    setBorderColor(0xFFFFFFFF);
     setHintergrundFarbe(0xFF000000);
 }
 
@@ -1029,7 +1029,7 @@ void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
     if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
     {
         int rbr = 0;
-        if (rahmen && DrawableBackground::hatStyle(Style::Rahmen))
+        if (rahmen && DrawableBackground::hatStyle(Style::Border))
             rbr = rahmen->getRBreite();
         if (((me.mx > gr.x - 15 - rbr) || me.id == ME_UScroll
                 || me.id == ME_DScroll)
@@ -1041,10 +1041,10 @@ void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
         }
         me.my += vertikalScrollBar->getScroll();
     }
-    me.my -= (rahmen && DrawableBackground::hatStyle(TextFeld::Style::Rahmen))
+    me.my -= (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
                ? rahmen->getRBreite() * 2
                : 0;
-    me.mx -= (rahmen && DrawableBackground::hatStyle(TextFeld::Style::Rahmen))
+    me.mx -= (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
                ? rahmen->getRBreite() * 2
                : 0;
     int ySum = 0;
@@ -1070,10 +1070,10 @@ void ZListe::doMausEreignis(MausEreignis& me, bool userRet)
     me.my
         += ySum
                  + (rahmen
-                     && DrawableBackground::hatStyle(TextFeld::Style::Rahmen))
+                     && DrawableBackground::hatStyle(TextField::Style::Border))
              ? rahmen->getRBreite() * 2
              : 0;
-    me.mx += (rahmen && DrawableBackground::hatStyle(TextFeld::Style::Rahmen))
+    me.mx += (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
                ? rahmen->getRBreite() * 2
                : 0;
     if (DrawableBackground::hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -1163,7 +1163,7 @@ void ZListe::updateVScroll()
             gr.y
                 - ((rahmen
                        && DrawableBackground::hatStyle(
-                           TextFeld::Style::Rahmen))
+                           TextField::Style::Border))
                         ? rahmen->getRBreite() * 2
                         : 0));
     }
@@ -1202,11 +1202,11 @@ bool ZListe::tick(double tickVal)
 
 //! Draws the object to zRObj if it is visible
 //! \param zRObj The image to draw into
-void ZListe::render(Bild& rObj)
+void ZListe::render(Image& rObj)
 {
     DrawableBackground::render(rObj);
     int index = 0;
-    int rbr = rahmen && DrawableBackground::hatStyle(TextFeld::Style::Rahmen)
+    int rbr = rahmen && DrawableBackground::hatStyle(TextField::Style::Border)
                 ? rahmen->getRBreite()
                 : 0;
     bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
@@ -1293,7 +1293,7 @@ Drawable* ZListe::zEintrag(int pos) const
 //! Returns the needed height
 int ZListe::getNeededHeight() const
 {
-    int y = (rahmen && DrawableBackground::hatStyle(TextFeld::Style::Rahmen))
+    int y = (rahmen && DrawableBackground::hatStyle(TextField::Style::Border))
               ? rahmen->getRBreite() * 2
               : 0;
     int index = 0;

List.h

@@ -6,15 +6,15 @@
 
 namespace Framework
 {
-    class Rahmen;            //! Border.h
+    class Border;            //! Border.h
     class AlphaFeld;         //! AlphaField.h
-    class Bild;              //! Image.h
+    class Image;              //! Image.h
     class Text;              //! Text.h
-    class TextFeld;          //! TextField.h
+    class TextField;          //! TextField.h
     class VScrollBar;        //! Scroll.h
     struct TastaturEreignis; //! KeyboardEvent.h
     struct MausEreignis;     //! MouseEvent.h
-    class Schrift;           //! Font.h
+    class Font;           //! Font.h
     class AuswahlListe;      //! from this file
 
     //! A drawing of the 2D GUI Framework that displays a list from which
@@ -26,11 +26,11 @@ namespace Framework
         {
         public:
             //! Specifies whether the list entries have a border
-            static const __int64 FeldRahmen = 0x0001000;
+            static const __int64 FieldBorder = 0x0001000;
             //! Specifies whether the entries have a background
             static const __int64 FeldHintergrund = 0x0002000;
             //! Specifies whether the entries have a background image
-            static const __int64 FeldHBild = 0x0004000;
+            static const __int64 FeldHImage = 0x0004000;
             //! Specifies whether alpha blending is used when drawing
             //! entry backgrounds
             static const __int64 FeldHAlpha = 0x0008000;
@@ -39,14 +39,14 @@ namespace Framework
             //! Specifies whether selected entries have a background
             static const __int64 AuswahlHintergrund = 0x0020000;
             //! Specifies whether selected entries have a background image
-            static const __int64 AuswahlHBild = 0x0040000;
+            static const __int64 AuswahlHImage = 0x0040000;
             //! Specifies whether alpha blending is used for drawing
             //! backgrounds of selected entries
             static const __int64 AuswahlHAlpha = 0x0080000;
             //! Specifies whether selected entries have a color gradient
             static const __int64 AuswahlBuffer = 0x0100000;
             //! Specifies whether selected entries have a border
-            static const __int64 AuswahlRahmen = 0x0200000;
+            static const __int64 SelectionBorder = 0x0200000;
             //! Specifies whether each entry has its own background,
             //! color gradient, and border when selected
             static const __int64 MultiStyled = 0x0400000;
@@ -56,26 +56,26 @@ namespace Framework
             //! MultiSelect was set.
             static const __int64 Selected = 0x1000000;
 
-            //! Combines the flags Sichtbar, Erlaubt, Rahmen, FeldHAlpha,
-            //! FeldHintergrund, FeldRahmen, AuswahlBuffer, AuswahlRahmen
+            //! Combines the flags Sichtbar, Erlaubt, Border, FeldHAlpha,
+            //! FeldHintergrund, FieldBorder, AuswahlBuffer, SelectionBorder
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Rahmen | FeldHAlpha | FeldHintergrund
-                | FeldRahmen | AuswahlBuffer | AuswahlRahmen;
+                = Sichtbar | Erlaubt | Border | FeldHAlpha | FeldHintergrund
+                | FieldBorder | AuswahlBuffer | SelectionBorder;
         };
 
     private:
-        RCArray<TextFeld>* tfListe;
+        RCArray<TextField>* tfListe;
         int auswahl;
         int ahFarbe;
-        Bild* ahBild;
+        Image* ahImage;
         AlphaFeld* aBuffer;
-        Rahmen* aRahmen;
+        Border* aBorder;
         Array<__int64>* styles;
         Array<int>* ahFarbeListe;
-        RCArray<Bild>* ahBildListe;
+        RCArray<Image>* ahImageListe;
         RCArray<AlphaFeld>* aBufferListe;
-        RCArray<Rahmen>* aRahmenListe;
-        Schrift* schrift;
+        RCArray<Border>* aBorderList;
+        Font* schrift;
         //! Processes mouse messages
         //! \param me The event triggered by the mouse input
         DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
@@ -95,8 +95,8 @@ namespace Framework
         //! \param txt The text of the entry
         DLLEXPORT void addEintrag(const char* txt);
         //! Adds a pointer to an entry
-        //! \param tf The TextFeld used to draw the entry
-        DLLEXPORT void addEintragZ(TextFeld* tf);
+        //! \param tf The TextField used to draw the entry
+        DLLEXPORT void addEintragZ(TextField* tf);
         //! Adds an entry at a specific position
         //! \param pos The index of the new entry
         //! \param txt The text of the entry
@@ -106,9 +106,9 @@ namespace Framework
         //! \param txt The text of the entry
         DLLEXPORT void addEintrag(int pos, const char* txt);
         //! Adds a pointer to an entry at a specific position
-        //! \param pos The index of the new entry \param tf The TextFeld
+        //! \param pos The index of the new entry \param tf The TextField
         //! used to draw the entry
-        DLLEXPORT void addEintragZ(int pos, TextFeld* tf);
+        DLLEXPORT void addEintragZ(int pos, TextField* tf);
         //! Changes an entry
         //! \param pos The index of the entry
         //! \param txt The new text of the entry
@@ -120,7 +120,7 @@ namespace Framework
         //! Changes the pointer of an entry
         //! \param pos The index of the entry
         //! \param tf The new entry
-        DLLEXPORT void setEintragZ(int pos, TextFeld* tf);
+        DLLEXPORT void setEintragZ(int pos, TextField* tf);
         //! Swaps the positions of two entries
         //! \param vpos The index of the first entry
         //! \param npos The index of the second entry
@@ -134,7 +134,7 @@ namespace Framework
         DLLEXPORT void removeEintrag(int pos);
         //! Sets the font to use
         //! \param schrift The font
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Scrolls to a specific entry
         //! \param eintrag The index of the entry
         DLLEXPORT void setVScrollZuEintrag(int eintrag);
@@ -142,7 +142,7 @@ namespace Framework
         DLLEXPORT void updateVScroll();
         //! Sets a pointer to the border used for selected entries
         //! if MultiStyled is not set \param rahmen The border
-        DLLEXPORT void setALRZ(Rahmen* rahmen);
+        DLLEXPORT void setALRZ(Border* rahmen);
         //! Sets the width of the border used for selected entries
         //! if MultiStyled is not set \param br The width in pixels
         DLLEXPORT void setALRBreite(int br);
@@ -160,17 +160,17 @@ namespace Framework
         DLLEXPORT void setAAFFarbe(int fc);
         //! Sets the background image by copying, used for selected entries
         //! if MultiStyled is not set \param bild The image to copy
-        DLLEXPORT void setAHBild(Bild* bild);
+        DLLEXPORT void setAHImage(Image* bild);
         //! Sets a pointer to the background image used for selected entries
         //! if MultiStyled is not set \param bild The image
-        DLLEXPORT void setAHBildZ(Bild* bild);
+        DLLEXPORT void setAHImageZ(Image* bild);
         //! Sets the background color used for selected entries
         //! if MultiStyled is not set \param fc The color in A8R8G8B8 format
         DLLEXPORT void setAHFarbe(int fc);
         //! Sets a pointer to the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param rahmen The border
-        DLLEXPORT void setALRZ(int pos, Rahmen* rahmen);
+        DLLEXPORT void setALRZ(int pos, Border* rahmen);
         //! Sets the width of the border used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param br The width in pixels
@@ -195,12 +195,12 @@ namespace Framework
         //! if MultiStyled is set
         //! \param pos The index of the entry
         //! \param bild The image to copy
-        DLLEXPORT void setAHBild(int pos, Bild* bild);
+        DLLEXPORT void setAHImage(int pos, Image* bild);
         //! Sets a pointer to the background image used for a selected entry
         //! if MultiStyled is set
         //! \param pos The index of the entry
         //! \param bild The image
-        DLLEXPORT void setAHBildZ(int pos, Bild* bild);
+        DLLEXPORT void setAHImageZ(int pos, Image* bild);
         //! Sets the background color used for a selected entry
         //! if MultiStyled is set \param pos The index of the entry
         //! \param fc The color in A8R8G8B8 format
@@ -228,7 +228,7 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the index of an entry the mouse points to
         //! \param my The position of the mouse on the Y axis relative to
         //! the top edge of the list
@@ -250,25 +250,25 @@ namespace Framework
         DLLEXPORT int getEintragPos(Text* eintragText);
         //! Returns an entry
         //! \param pos The index of the entry
-        DLLEXPORT TextFeld* getEintrag(int pos) const;
+        DLLEXPORT TextField* getEintrag(int pos) const;
         //! Returns an entry without increased reference counter
         //! \param pos The index of the entry
-        DLLEXPORT TextFeld* zEintrag(int pos) const;
+        DLLEXPORT TextField* zEintrag(int pos) const;
         //! Returns the border used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT Rahmen* getARahmen() const;
+        DLLEXPORT Border* getABorder() const;
         //! Returns the border without increased reference counter used for
         //! selected entries if MultiStyled is not set
-        DLLEXPORT Rahmen* zARahmen() const;
+        DLLEXPORT Border* zABorder() const;
         //! Returns the background color in A8R8G8B8 format used for
         //! selected entries if MultiStyled is not set
         DLLEXPORT int getAHFarbe() const;
         //! Returns the background image used for selected entries
         //! if MultiStyled is not set
-        DLLEXPORT Bild* getAHBild() const;
+        DLLEXPORT Image* getAHImage() const;
         //! Returns the background image without increased reference counter
         //! used for selected entries if MultiStyled is not set
-        DLLEXPORT Bild* zAHBild() const;
+        DLLEXPORT Image* zAHImage() const;
         //! Returns the color gradient used for selected entries
         //! if MultiStyled is not set
         DLLEXPORT AlphaFeld* getABuffer() const;
@@ -277,19 +277,19 @@ namespace Framework
         DLLEXPORT AlphaFeld* zABuffer() const;
         //! Returns the border used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT Rahmen* getARahmen(int pos) const;
+        DLLEXPORT Border* getABorder(int pos) const;
         //! Returns the border without increased reference counter used for
         //! a selected entry if MultiStyled is set
-        DLLEXPORT Rahmen* zARahmen(int pos) const;
+        DLLEXPORT Border* zABorder(int pos) const;
         //! Returns the background color in A8R8G8B8 format used for a
         //! selected entry if MultiStyled is set
         DLLEXPORT int getAHFarbe(int pos) const;
         //! Returns the background image used for a selected entry
         //! if MultiStyled is set
-        DLLEXPORT Bild* getAHBild(int pos) const;
+        DLLEXPORT Image* getAHImage(int pos) const;
         //! Returns the background image without increased reference counter
         //! used for a selected entry if MultiStyled is set
-        DLLEXPORT Bild* zAHBild(int pos) const;
+        DLLEXPORT Image* zAHImage(int pos) const;
         //! Returns the color gradient used for a selected entry
         //! if MultiStyled is set
         DLLEXPORT AlphaFeld* getABuffer(int pos) const;
@@ -318,9 +318,9 @@ namespace Framework
             //! draws a seperation line between the entries
             static const __int64 EntrySeperator = 0x0001000;
             //! Combines the flags Sichtbar, Erlaubt,
-            //! Rahmen, Hintergrund
+            //! Border, Hintergrund
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Rahmen | Hintergrund | EntrySeperator;
+                = Sichtbar | Erlaubt | Border | Hintergrund | EntrySeperator;
         };
 
     private:
@@ -375,7 +375,7 @@ namespace Framework
         DLLEXPORT bool tick(double tickVal) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& rObj) override;
+        DLLEXPORT void render(Image& rObj) override;
         //! Returns the index of an entry the mouse points to
         //! \param my The position of the mouse on the Y axis relative to
         //! the top edge of the list

M2DPreview.cpp

@@ -96,7 +96,7 @@ bool M2DVorschau::tick(double tv)
     return DrawableBackground::tick(tv);
 }
 
-void M2DVorschau::render(Bild& rb)
+void M2DVorschau::render(Image& rb)
 {
     removeStyle(Style::VScroll | Style::HScroll);
     if (hatStyleNicht(Style::Sichtbar)) return;
@@ -104,7 +104,7 @@ void M2DVorschau::render(Bild& rb)
     if (!rb.setDrawOptions(innenPosition, innenSize)) return;
     if (mdl)
     {
-        int rbr = rahmen && hatStyle(Style::Rahmen) ? rahmen->getRBreite() : 0;
+        int rbr = rahmen && hatStyle(Style::Border) ? rahmen->getRBreite() : 0;
         rb.addScrollOffset(-gr.x / 2 + rbr, -gr.y / 2 + rbr);
         mdl->render(rb);
     }
@@ -126,7 +126,7 @@ Drawable* M2DVorschau::dublizieren() const
 {
     M2DVorschau* ret = new M2DVorschau();
     if (mdl) ret->setModel2D(mdl->getModel());
-    if (rahmen) ret->setRahmenZ((Rahmen*)rahmen->dublizieren());
+    if (rahmen) ret->setBorderZ((Border*)rahmen->dublizieren());
     if (hintergrundFeld)
         ret->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
     ret->setHintergrundFarbe(bgF);

M2DPreview.h

@@ -6,7 +6,7 @@ namespace Framework
 {
     class Model2D;       //! Model2D.h
     class Model2DData;   //! Model2D.h
-    class Rahmen;        //! Border.h
+    class Border;        //! Border.h
     class AlphaFeld;     //! AlphaField.h
     struct MausEreignis; //! MouseEvent.h
 
@@ -30,7 +30,7 @@ namespace Framework
 
     private:
         Model2D* mdl;
-        Rahmen* ram;
+        Border* ram;
         AlphaFeld* af;
         int bgF;
         int mx;
@@ -57,7 +57,7 @@ namespace Framework
         DLLEXPORT bool tick(double tv) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& rb) override;
+        DLLEXPORT void render(Image& rb) override;
         //! Returns the displayed model without increased reference counter
         DLLEXPORT Model2D* zModel() const;
         //! Returns the displayed model

Model2D.cpp

@@ -783,7 +783,7 @@ void Model2DObject::setTextur(Textur2D* t, const char* polygonName)
 }
 
 void Model2DObject::render(
-    Mat3<float>& kamMat, Bild& zRObj, const char* kamName)
+    Mat3<float>& kamMat, Image& zRObj, const char* kamName)
 {
     if (!rData || !rData->polygons || !textur) return;
     int num = 0;
@@ -792,7 +792,7 @@ void Model2DObject::render(
         Mat3<float> mat = kamMat * getObjectMatrix();
         if (textur->hat(num))
         {
-            Bild* txt = textur->z(num)->zTextur();
+            Image* txt = textur->z(num)->zTextur();
             for (auto i = p->begin(); i && txt; i++)
             {
                 for (auto j = i->zListe()->begin();
@@ -1157,7 +1157,7 @@ bool Model2D::tick(double tickVal)
     return Drawable::tick(tickVal);
 }
 
-void Model2D::render(Bild& zRObj)
+void Model2D::render(Image& zRObj)
 {
     if (!rData || hatStyleNicht(Model2D::Style::Sichtbar) || !rData->polygons)
         return;
@@ -1191,7 +1191,7 @@ void Model2D::render(Bild& zRObj)
             }
             else
             {
-                Bild* txt = textur->z(num)->zTextur();
+                Image* txt = textur->z(num)->zTextur();
                 for (auto i : *p)
                 {
                     for (auto j = i->zListe()->begin();
@@ -1248,7 +1248,7 @@ void Model2D::render(Bild& zRObj)
                 }
             }
         }
-        if (hatStyle(Model2D::Style::Rahmen))
+        if (hatStyle(Model2D::Style::Border))
         {
             auto beg = rData->polygons->get(num).vertex->begin();
             if (beg)

Model2D.h

@@ -119,7 +119,7 @@ namespace Framework
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
         __declspec(dllexport) void render(
-            Mat3<float>& kamMat, Bild& zRObj, const char* kamName) override;
+            Mat3<float>& kamMat, Image& zRObj, const char* kamName) override;
         //! Returns whether a point is inside the model
         //! \param p The point
         //! \param ignoreTransparentFlag if 1, collisions with transparent
@@ -183,7 +183,7 @@ namespace Framework
         public:
             static const __int64 Textur
                 = 0x8; //! If this flag is set, a texture is used when drawing
-            static const __int64 Rahmen
+            static const __int64 Border
                 = 0x10; //! If this flag is set, the polygon borders are drawn
             static const __int64 Alpha
                 = 0x40; //! If this flag is set, alpha blending is used when drawing
@@ -234,7 +234,7 @@ namespace Framework
         __declspec(dllexport) bool tick(double tickVal) override;
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
-        __declspec(dllexport) void render(Bild& zRObj) override;
+        __declspec(dllexport) void render(Image& zRObj) override;
         //! Returns the rotation of the model
         __declspec(dllexport) float getDrehung() const;
         //! Returns the scaling factor

Model3D.cpp

@@ -971,7 +971,7 @@ int Model3D::traceRay(
                     float a3
                         = (a - hit).crossProduct(b - hit).getLength() / 2 / a0;
                     Vertex ht = at * a1 + bt * a2 + ct * a3;
-                    Bild* tex = textur->zPolygonTextur(index)->zBild();
+                    Image* tex = textur->zPolygonTextur(index)->zImage();
                     if (ht.x >= 0 && ht.y >= 0 && ht.x <= 1 && ht.y <= 1)
                         return tex->getPixel(
                             (int)(ht.x * ((float)tex->getBreite() - 1.f)

Mouse.cpp

@@ -29,7 +29,7 @@ void Maus::ladeMaus(int mausId)
     SetCursor(hMaus);
 }
 
-void Maus::ladeMaus(Bild* maus)
+void Maus::ladeMaus(Image* maus)
 {
     HBITMAP hAndMaskBitmap;
     HBITMAP hXorMaskBitmap;

Mouse.h

@@ -6,7 +6,7 @@
 
 namespace Framework
 {
-    class Bild; //! from Image.h
+    class Image; //! from Image.h
     class Maus; //! from this file
 
     namespace MausId
@@ -41,7 +41,7 @@ namespace Framework
         DLLEXPORT void ladeMaus(int mausId);
         //! Copies an image and uses it as mouse cursor.
         //! \param maus The image to use as mouse cursor
-        DLLEXPORT void ladeMaus(Bild* maus);
+        DLLEXPORT void ladeMaus(Image* maus);
         //! Updates the mouse. Called by the framework itself
         DLLEXPORT void update();
         //! returns a handle to the mouse cursor.

MouseEvent.cpp

@@ -9,9 +9,9 @@ bool Framework::_ret1ME(void* param, void* obj, MausEreignis me)
     return 1;
 }
 
-bool Framework::_closeFensterME(void* param, void* obj, MausEreignis me)
+bool Framework::_closeWindowME(void* param, void* obj, MausEreignis me)
 {
     if (me.id == ME_RLinks)
-        ((Fenster*)obj)->removeStyle(Fenster::Style::Sichtbar);
+        ((Window*)obj)->removeStyle(Window::Style::Sichtbar);
     return 1;
 }

MouseEvent.h

@@ -76,7 +76,7 @@ namespace Framework
     //! \return (true) if the calling drawing should continue processing
     //! the event. (false) otherwise. Always returns (true) and closes the
     //! window that called it (may only be set on windows)
-    DLLEXPORT bool _closeFensterME(void* param, void* obj, MausEreignis me);
+    DLLEXPORT bool _closeWindowME(void* param, void* obj, MausEreignis me);
 } // namespace Framework
 
 #endif

Point.cpp

@@ -8,22 +8,22 @@ using namespace Framework;
 
 // other functions
 #ifdef WIN32
-inline Punkt Framework::BildschirmGroesse(int mId) // Returns the screen size
+inline Punkt Framework::ScreenSize(int mId) // Returns the screen size
 {
     Monitor m = getMonitor(mId);
     return Punkt(m.breite, m.height);
 }
 
-inline Punkt Framework::Bildschirmmitte(int mId) // Returns the screen center
+inline Punkt Framework::ScreenCenter(int mId) // Returns the screen center
 {
     Monitor m = getMonitor(mId);
     return Punkt(m.x + m.breite / 2, m.y + m.height / 2);
 }
 
-inline Punkt Framework::Bildschirmmitte(
-    WFenster* f, int mId) // Returns the screen center
+inline Punkt Framework::ScreenCenter(
+    NativeWindow* f, int mId) // Returns the screen center
 {
-    Punkt p = Bildschirmmitte(mId);
+    Punkt p = ScreenCenter(mId);
     Punkt p2 = f->getGroesse();
     f->release();
     return {p.x - p2.x / 2, p.y - p2.y / 2};

Point.h

@@ -7,19 +7,19 @@
 namespace Framework
 {
     //! required includes
-    class WFenster; //! from Window.h
+    class NativeWindow; //! from Window.h
 
     typedef Vec2<int>
         Punkt; //! Stores the integer coordinates of a point
 
 #ifdef WIN32
     //! Returns the size of the screen
-    DLLEXPORT Punkt BildschirmGroesse(int mId = 0);
+    DLLEXPORT Punkt ScreenSize(int mId = 0);
     //! Returns the center of the screen
-    DLLEXPORT Punkt Bildschirmmitte(int mId = 0);
+    DLLEXPORT Punkt ScreenCenter(int mId = 0);
     //! Returns a point that can be used as a window position
     //! to center the window \param f The window to center
-    DLLEXPORT Punkt Bildschirmmitte(WFenster* f, int mId = 0);
+    DLLEXPORT Punkt ScreenCenter(NativeWindow* f, int mId = 0);
 #endif
     //! Checks whether a point is further to the bottom-right than another
     //! \return (true) if the left point is further right and further down.

Progress.cpp

@@ -15,10 +15,10 @@ FBalken::FBalken()
     : DrawableBackground(),
       maxAk(0),
       ak(0),
-      fRahmen(0),
+      fBorder(0),
       fBuffer(0),
       fBgF(0xFF000000),
-      fBgBild(0),
+      fBgImage(0),
       textRd(0),
       schriftFarbe(0),
       schriftSize(0)
@@ -29,9 +29,9 @@ FBalken::FBalken()
 // Destructor
 FBalken::~FBalken()
 {
-    if (fRahmen) fRahmen->release();
+    if (fBorder) fBorder->release();
     if (fBuffer) fBuffer->release();
-    if (fBgBild) fBgBild->release();
+    if (fBgImage) fBgImage->release();
     if (textRd) textRd->release();
 }
 
@@ -55,25 +55,25 @@ void FBalken::reset() // resets the completed actions
     rend = 1;
 }
 
-void FBalken::setFRahmenZ(
-    Rahmen* ram) // sets a pointer to the completion border
+void FBalken::setFBorderZ(
+    Border* ram) // sets a pointer to the completion border
 {
-    if (fRahmen) fRahmen->release();
-    fRahmen = ram;
+    if (fBorder) fBorder->release();
+    fBorder = ram;
     rend = 1;
 }
 
 void FBalken::setFRFarbe(int f) // sets the completion border color
 {
-    if (!fRahmen) fRahmen = new LRahmen();
-    fRahmen->setFarbe(f);
+    if (!fBorder) fBorder = new LBorder();
+    fBorder->setFarbe(f);
     rend = 1;
 }
 
 void FBalken::setFRBreite(int br) // sets the completion border width
 {
-    if (!fRahmen) fRahmen = new LRahmen();
-    fRahmen->setRamenBreite(br);
+    if (!fBorder) fBorder = new LBorder();
+    fBorder->setRamenBreite(br);
     rend = 1;
 }
 
@@ -106,18 +106,18 @@ void FBalken::setFBgFarbe(int f) // sets the completion background color
     rend = 1;
 }
 
-void FBalken::setFBgBildZ(Bild* b) // sets the completion background image
+void FBalken::setFBgImageZ(Image* b) // sets the completion background image
 {
-    if (fBgBild) fBgBild->release();
-    fBgBild = b;
+    if (fBgImage) fBgImage->release();
+    fBgImage = b;
     rend = 1;
 }
 
-void FBalken::setFBgBild(Bild* b) // copies into the completion background image
+void FBalken::setFBgImage(Image* b) // copies into the completion background image
 {
-    if (!fBgBild) fBgBild = new Bild();
-    fBgBild->neuBild(b->getBreite(), b->getHeight(), 0);
-    fBgBild->drawBild(0, 0, b->getBreite(), b->getHeight(), *b);
+    if (!fBgImage) fBgImage = new Image();
+    fBgImage->neuImage(b->getBreite(), b->getHeight(), 0);
+    fBgImage->drawImage(0, 0, b->getBreite(), b->getHeight(), *b);
     b->release();
     rend = 1;
 }
@@ -128,12 +128,12 @@ void FBalken::setTextRendererZ(TextRenderer* textRd)
     this->textRd = textRd;
 }
 
-void FBalken::setSchriftZ(Schrift* s) // sets the font
+void FBalken::setFontZ(Font* s) // sets the font
 {
     if (!textRd)
         textRd = new TextRenderer(s);
     else
-        textRd->setSchriftZ(s);
+        textRd->setFontZ(s);
     rend = 1;
 }
 
@@ -149,7 +149,7 @@ void FBalken::setSSize(unsigned char gr) // sets the font size
     rend = 1;
 }
 
-void FBalken::render(Bild& zRObj) // renders into zRObj
+void FBalken::render(Image& zRObj) // renders into zRObj
 {
     if (!hatStyle(Style::Sichtbar)) return;
     lockDrawable();
@@ -186,11 +186,11 @@ void FBalken::render(Bild& zRObj) // renders into zRObj
         return;
     }
     int rbr = 0;
-    if (hatStyle(Style::FRahmen) && fRahmen)
+    if (hatStyle(Style::FRahmen) && fBorder)
     {
-        fRahmen->setSize(b, h);
-        fRahmen->render(zRObj);
-        rbr = fRahmen->getRBreite();
+        fBorder->setSize(b, h);
+        fBorder->render(zRObj);
+        rbr = fBorder->getRBreite();
     }
     if (hatStyle(Style::FFarbe))
     {
@@ -199,14 +199,14 @@ void FBalken::render(Bild& zRObj) // renders into zRObj
         else
             zRObj.fillRegion(rbr, rbr, b - rbr * 2, h - rbr * 2, fBgF);
     }
-    if (hatStyle(Style::FBild) && fBgBild)
+    if (hatStyle(Style::FImage) && fBgImage)
     {
         if (hatStyle(Style::FAlpha))
-            zRObj.alphaBildSkall(
-                rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgBild);
+            zRObj.alphaImageSkall(
+                rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgImage);
         else
-            zRObj.alphaBildSkall(
-                rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgBild);
+            zRObj.alphaImageSkall(
+                rbr, rbr, gr.x - rbr * 2, gr.y - rbr * 2, *fBgImage);
     }
     if (hatStyle(Style::FBuffered) && fBuffer)
     {
@@ -273,15 +273,15 @@ __int64 FBalken::getAktion() const // returns the completed actions
     return ak;
 }
 
-Rahmen* FBalken::getFRahmen() const // returns the completion border
+Border* FBalken::getFBorder() const // returns the completion border
 {
-    if (fRahmen) return dynamic_cast<Rahmen*>(fRahmen->getThis());
+    if (fBorder) return dynamic_cast<Border*>(fBorder->getThis());
     return 0;
 }
 
-Rahmen* FBalken::zFRahmen() const
+Border* FBalken::zFBorder() const
 {
-    return fRahmen;
+    return fBorder;
 }
 
 AlphaFeld* FBalken::getFAlphaFeld() const // returns the completion AlphaFeld
@@ -300,26 +300,26 @@ int FBalken::getFBgFarbe() const // returns the completion background color
     return fBgF;
 }
 
-Bild* FBalken::getFBgBild() const // returns the completion background image
+Image* FBalken::getFBgImage() const // returns the completion background image
 {
-    if (fBgBild) return dynamic_cast<Bild*>(fBgBild->getThis());
+    if (fBgImage) return dynamic_cast<Image*>(fBgImage->getThis());
     return 0;
 }
 
-Bild* FBalken::zFBgBild() const
+Image* FBalken::zFBgImage() const
 {
-    return fBgBild;
+    return fBgImage;
 }
 
-Schrift* FBalken::getSchrift() const // returns the font
+Font* FBalken::getFont() const // returns the font
 {
-    if (textRd) return textRd->getSchrift();
+    if (textRd) return textRd->getFont();
     return 0;
 }
 
-Schrift* FBalken::zSchrift() const
+Font* FBalken::zFont() const
 {
-    return textRd ? textRd->zSchrift() : 0;
+    return textRd ? textRd->zFont() : 0;
 }
 
 int FBalken::getSFarbe() const // returns the font color

Progress.h

@@ -5,10 +5,10 @@
 
 namespace Framework
 {
-    class Rahmen;    //! Border.h
+    class Border;    //! Border.h
     class AlphaFeld; //! AlphaField.h
-    class Bild;      //! Image.h
-    class Schrift;   //! Font.h
+    class Image;      //! Image.h
+    class Font;   //! Font.h
     class FBalken;   //! from this file
     class TextRenderer;
 
@@ -31,7 +31,7 @@ namespace Framework
             static const __int64 FFarbe = 0x004000;
             //! Determines whether the progress-covered part of the bar has
             //! its own background image
-            static const __int64 FBild = 0x008000;
+            static const __int64 FImage = 0x008000;
             //! Determines whether the progress-covered part of the bar uses
             //! alpha blending for drawing its background
             static const __int64 FAlpha = 0x10000;
@@ -50,18 +50,18 @@ namespace Framework
 
             //! Combines flags Visible, Border, Background, BackgroundImage,
             //! FBorder, FImage, L_R, Percent
-            static const __int64 normal = Sichtbar | Rahmen | Hintergrund
-                                        | HBild | FRahmen | FBild | L_R
-                                        | Prozent | Aktionen | HBildScale;
+            static const __int64 normal = Sichtbar | Border | Hintergrund
+                                        | HImage | FRahmen | FImage | L_R
+                                        | Prozent | Aktionen | HImageScale;
         };
 
     private:
         __int64 maxAk;
         __int64 ak;
-        Rahmen* fRahmen;
+        Border* fBorder;
         AlphaFeld* fBuffer;
         int fBgF;
-        Bild* fBgBild;
+        Image* fBgImage;
         TextRenderer* textRd;
         int schriftFarbe;
         unsigned char schriftSize;
@@ -82,7 +82,7 @@ namespace Framework
         DLLEXPORT void reset();
         //! Sets a pointer to the border drawn in the progress-covered part
         //! of the bar \param ram The border
-        DLLEXPORT void setFRahmenZ(Rahmen* ram);
+        DLLEXPORT void setFBorderZ(Border* ram);
         //! Sets the color of the border drawn in the progress-covered part
         //! of the bar \param f The color in A8R8G8B8 format
         DLLEXPORT void setFRFarbe(int f);
@@ -103,15 +103,15 @@ namespace Framework
         DLLEXPORT void setFBgFarbe(int f);
         //! Sets a pointer to the background image drawn in the progress-covered
         //! part of the bar \param b The image
-        DLLEXPORT void setFBgBildZ(Bild* b);
+        DLLEXPORT void setFBgImageZ(Image* b);
         //! Sets the background image by copying, drawn in the progress-covered
         //! part of the bar \param b The image to copy
-        DLLEXPORT void setFBgBild(Bild* b);
+        DLLEXPORT void setFBgImage(Image* b);
         //! Sets the text renderer used
         //! \param textRd The text renderer
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the font used to draw the percentage display
-        DLLEXPORT void setSchriftZ(Schrift* b);
+        DLLEXPORT void setFontZ(Font* b);
         //! Sets the color of the percentage display
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setSFarbe(int f);
@@ -120,7 +120,7 @@ namespace Framework
         DLLEXPORT void setSSize(unsigned char gr);
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the number of operations needed for 100%
         DLLEXPORT __int64 getAktionAnzahl() const;
         //! Returns the current percentage of progress
@@ -128,10 +128,10 @@ namespace Framework
         //! Returns the number of completed operations
         DLLEXPORT __int64 getAktion() const;
         //! Returns the border drawn in the progress-covered part of the bar
-        DLLEXPORT Rahmen* getFRahmen() const;
+        DLLEXPORT Border* getFBorder() const;
         //! Returns the border without increased reference counter drawn in the
         //! progress-covered part of the bar
-        DLLEXPORT Rahmen* zFRahmen() const;
+        DLLEXPORT Border* zFBorder() const;
         //! Returns the color gradient drawn in the progress-covered part of the bar
         DLLEXPORT AlphaFeld* getFAlphaFeld() const;
         //! Returns the color gradient without increased reference counter drawn
@@ -142,15 +142,15 @@ namespace Framework
         DLLEXPORT int getFBgFarbe() const;
         //! Returns the background image drawn in the progress-covered part
         //! of the bar
-        DLLEXPORT Bild* getFBgBild() const;
+        DLLEXPORT Image* getFBgImage() const;
         //! Returns the background image without increased reference counter
         //! drawn in the progress-covered part of the bar
-        DLLEXPORT Bild* zFBgBild() const;
+        DLLEXPORT Image* zFBgImage() const;
         //! Returns the font used for the percentage display
-        DLLEXPORT Schrift* getSchrift() const;
+        DLLEXPORT Font* getFont() const;
         //! Returns the font without increased reference counter used for the
         //! percentage display
-        DLLEXPORT Schrift* zSchrift() const;
+        DLLEXPORT Font* zFont() const;
         //! Returns the color of the percentage display in A8R8G8B8 format
         DLLEXPORT int getSFarbe() const;
     };

RenderThread.cpp

@@ -44,7 +44,7 @@ void RenderTh::unlock()
     cs.unlock();
 }
 
-void RenderTh::setBildschirm(Bildschirm* bildschirm) // sets the screen
+void RenderTh::setScreen(Screen* bildschirm) // sets the screen
 {
     lock();
     if (this->bildschirm) this->bildschirm->release();
@@ -65,7 +65,7 @@ void RenderTh::thread() // Render loop
         {
             if (renderFunktion)
                 renderFunktion(
-                    renderParameter, this, bildschirm->zRenderBild());
+                    renderParameter, this, bildschirm->zRenderImage());
             bildschirm->render();
             val++;
             if (tickFunktion) tickFunktion(tickParameter, this, renderTickZeit);
@@ -125,7 +125,7 @@ void RenderTh::setPause(bool p) // Render pause
     pause = p;
 }
 
-void RenderTh::setRenderFunktion(std::function<void(void*, void*, Bild*)>
+void RenderTh::setRenderFunktion(std::function<void(void*, void*, Image*)>
         rF) // sets the callback function for rendering
 {
     renderFunktion = rF;
@@ -150,12 +150,12 @@ void RenderTh::setTickFunktionParameter(
 }
 
 // constant
-Bildschirm* RenderTh::getBildschirm() const // returns the screen
+Screen* RenderTh::getScreen() const // returns the screen
 {
-    return bildschirm ? dynamic_cast<Bildschirm*>(bildschirm->getThis()) : 0;
+    return bildschirm ? dynamic_cast<Screen*>(bildschirm->getThis()) : 0;
 }
 
-Bildschirm* RenderTh::zBildschirm() const
+Screen* RenderTh::zScreen() const
 {
     return bildschirm;
 }

RenderThread.h

@@ -8,9 +8,9 @@
 
 namespace Framework
 {
-    class Bildschirm; //! Screen.h
+    class Screen; //! Screen.h
     class ZeitMesser; //! ZeitMesser.h
-    class Bild;       //! Image.h
+    class Image;       //! Image.h
 
     //! A thread that manages a screen. It calls the render() and
     //! tick() functions automatically
@@ -18,12 +18,12 @@ namespace Framework
     {
     private:
         bool stoppen;
-        Bildschirm* bildschirm;
+        Screen* bildschirm;
         ZeitMesser* zeit;
         double renderTickZeit;
         void* renderParameter;
         void* tickParameter;
-        std::function<void(void*, void*, Bild*)> renderFunktion;
+        std::function<void(void*, void*, Image*)> renderFunktion;
         std::function<void(void*, void*, double)> tickFunktion;
         bool pause;
         Critical cs;
@@ -45,7 +45,7 @@ namespace Framework
         DLLEXPORT void unlock();
         //! Sets the screen object to be managed
         //! \param bildschirm The screen
-        DLLEXPORT void setBildschirm(Bildschirm* bildschirm);
+        DLLEXPORT void setScreen(Screen* bildschirm);
         //! The function that is automatically executed in a new thread
         DLLEXPORT void thread() override;
         //! Starts the render thread
@@ -63,7 +63,7 @@ namespace Framework
         //! Sets the callback function that is always called before drawing
         //! \param rF The callback function
         DLLEXPORT void setRenderFunktion(
-            std::function<void(void*, void*, Bild*)> rF);
+            std::function<void(void*, void*, Image*)> rF);
         //! Sets the callback function that is always called before updating
         //! all objects \param tF The callback function
         DLLEXPORT void setTickFunktion(
@@ -75,10 +75,10 @@ namespace Framework
         //! before updating all objects
         DLLEXPORT void setTickFunktionParameter(void* p);
         //! Returns the screen managed by this thread
-        DLLEXPORT Bildschirm* getBildschirm() const;
+        DLLEXPORT Screen* getScreen() const;
         //! Returns the screen without increased reference counter managed
         //! by this thread
-        DLLEXPORT Bildschirm* zBildschirm() const;
+        DLLEXPORT Screen* zScreen() const;
         //! Returns the time with which the tick() function of the screen
         //! was last called
         DLLEXPORT double getRenderTickZeit() const;

Screen.cpp

@@ -27,9 +27,9 @@
 
 using namespace Framework;
 
-// Content of the Bildschirm class from Screen.h
+// Content of the Screen class from Screen.h
 // Constructor
-Bildschirm::Bildschirm(WFenster* f)
+Screen::Screen(NativeWindow* f)
     : ReferenceCounter(),
       api(0),
       fenster(f),
@@ -49,7 +49,7 @@ Bildschirm::Bildschirm(WFenster* f)
 {}
 
 // Destructor
-Bildschirm::~Bildschirm()
+Screen::~Screen()
 {
     lock();
 #ifdef WIN32
@@ -63,49 +63,49 @@ Bildschirm::~Bildschirm()
     unlock();
 }
 
-void Bildschirm::postAction(std::function<void()> action)
+void Screen::postAction(std::function<void()> action)
 {
     cs.lock();
     actions.push(action);
     cs.unlock();
 }
 
-void Bildschirm::setHandleUserInputsOnTick(bool handleOnTick)
+void Screen::setHandleUserInputsOnTick(bool handleOnTick)
 {
     handleUserInputsOnTick = handleOnTick;
 }
 
 // non-constant
-void Bildschirm::lock()
+void Screen::lock()
 {
     cs.lock();
 }
 
-void Bildschirm::unlock()
+void Screen::unlock()
 {
     cs.unlock();
 }
 
-void Bildschirm::setFill(bool f)
+void Screen::setFill(bool f)
 {
     fill = f;
 }
 
 // Updates the objects that manage the graphics card
-void Bildschirm::update()
+void Screen::update()
 {
     lock();
     api->update();
     unlock();
 }
 
-void Bildschirm::setTestRend(
+void Screen::setTestRend(
 bool tr) // specifies whether to check for updates before rendering
 {
     testRend = tr;
 }
 
-void Bildschirm::setRenderDrawables(
+void Screen::setRenderDrawables(
 bool rO) // specifies whether drawings are rendered
 {
     lock();
@@ -114,14 +114,14 @@ bool rO) // specifies whether drawings are rendered
     unlock();
 }
 
-void Bildschirm::setOnTop(
+void Screen::setOnTop(
 bool onTop) // specifies whether the onTop drawing is rendered
 {
     renderOnTop = onTop;
     rend = 1;
 }
 
-void Bildschirm::setOnTopDrawable(Drawable* obj) // sets the onTop drawing
+void Screen::setOnTopDrawable(Drawable* obj) // sets the onTop drawing
 {
     lock();
     if (onTop) onTop->release();
@@ -130,13 +130,13 @@ void Bildschirm::setOnTopDrawable(Drawable* obj) // sets the onTop drawing
     unlock();
 }
 
-void Bildschirm::setdeckFarbe(int f) // sets the overlay color
+void Screen::setdeckFarbe(int f) // sets the overlay color
 {
     deckFarbe = f;
     rend = 1;
 }
 
-void Bildschirm::addMember(Drawable* obj) // Adds a drawing
+void Screen::addMember(Drawable* obj) // Adds a drawing
 {
     lock();
     members->add(obj);
@@ -144,7 +144,7 @@ void Bildschirm::addMember(Drawable* obj) // Adds a drawing
     unlock();
 }
 
-void Bildschirm::removeMember(Drawable* zObj) // Removes a drawing
+void Screen::removeMember(Drawable* zObj) // Removes a drawing
 {
     lock();
     for (int i = 0; i < members->getEintragAnzahl(); i++)
@@ -156,7 +156,7 @@ void Bildschirm::removeMember(Drawable* zObj) // Removes a drawing
 }
 
 // Draws an image and presents it on the screen
-void Bildschirm::render()
+void Screen::render()
 {
     lock();
     api->update();
@@ -164,20 +164,20 @@ void Bildschirm::render()
     unlock();
 }
 
-void Bildschirm::setFillFarbe(int f) // sets the fill color
+void Screen::setFillFarbe(int f) // sets the fill color
 {
     fillColor = f;
     rend = 1;
 }
 
-void Bildschirm::setVollbild(bool vollbild) // sets fullscreen
+void Screen::setVollbild(bool vollbild) // sets fullscreen
 {
     lock();
     api->setFullScreen(vollbild);
     unlock();
 }
 
-void Bildschirm::tick(double tickval)
+void Screen::tick(double tickval)
 {
     lock();
     while (!actions.empty())
@@ -207,7 +207,7 @@ void Bildschirm::tick(double tickval)
     unlock();
 }
 
-void Bildschirm::setBackBufferSize(
+void Screen::setBackBufferSize(
 int breite, int height) // sets the size of the back buffer
 {
     lock();
@@ -215,14 +215,14 @@ int breite, int height) // sets the size of the back buffer
     unlock();
 }
 
-void Bildschirm::setBackBufferSize(Punkt& size)
+void Screen::setBackBufferSize(Punkt& size)
 {
     lock();
     api->setBackBufferSize(size);
     unlock();
 }
 
-void Bildschirm::doMausEreignis(MausEreignis& me) // sends mouse event
+void Screen::doMausEreignis(MausEreignis& me) // sends mouse event
 {
     int fBr = api->getBackBufferSize().x;
     int fHi = api->getBackBufferSize().y;
@@ -258,7 +258,7 @@ void Bildschirm::doMausEreignis(MausEreignis& me) // sends mouse event
     unlock();
 }
 
-void Bildschirm::doTastaturEreignis(
+void Screen::doTastaturEreignis(
 TastaturEreignis& te) // sends keyboard event
 {
     lock();
@@ -275,7 +275,7 @@ TastaturEreignis& te) // sends keyboard event
     unlock();
 }
 
-void Bildschirm::addToolTip(ToolTip* tip) // adds a ToolTip
+void Screen::addToolTip(ToolTip* tip) // adds a ToolTip
 {
     lock();
     tips->add(tip);
@@ -284,39 +284,39 @@ void Bildschirm::addToolTip(ToolTip* tip) // adds a ToolTip
 }
 
 // constant
-Bild* Bildschirm::getRenderBild() const
+Image* Screen::getRenderImage() const
 {
-    return dynamic_cast<Bild*>(api->zUIRenderBild()->getThis());
+    return dynamic_cast<Image*>(api->zUIRenderImage()->getThis());
 }
 
-Bild* Bildschirm::zRenderBild() const
+Image* Screen::zRenderImage() const
 {
-    return api->zUIRenderBild();
+    return api->zUIRenderImage();
 }
 
 ArrayIterator<Drawable*>
-Bildschirm::getMembers() const // returns the drawings
+Screen::getMembers() const // returns the drawings
 {
     return members->begin();
 }
 
-int Bildschirm::getFillFarbe() const // returns the fill color
+int Screen::getFillFarbe() const // returns the fill color
 {
     return fillColor;
 }
 
-bool Bildschirm::istVolbild() const // returns whether fullscreen is on
+bool Screen::istVolbild() const // returns whether fullscreen is on
 {
     return api->isFullScreen();
 }
 
 const Punkt
-Bildschirm::getBackBufferSize() const // returns the size of the back buffer
+Screen::getBackBufferSize() const // returns the size of the back buffer
 {
     return api->getBackBufferSize();
 }
 
-void Bildschirm::warteAufRendern() const // waits for the render function
+void Screen::warteAufRendern() const // waits for the render function
 {
     while (rendering)
     {
@@ -324,20 +324,20 @@ void Bildschirm::warteAufRendern() const // waits for the render function
     }
 }
 
-double Bildschirm::getRenderZeit()
+double Screen::getRenderZeit()
 const // returns how many seconds rendering takes
 {
     return renderZeit->getSekunden();
 }
 
 // Returns the graphics API (without increased reference counter)
-GraphicsApi* Bildschirm::zGraphicsApi() const
+GraphicsApi* Screen::zGraphicsApi() const
 {
     return api;
 }
 
 // Returns the graphics API
-GraphicsApi* Bildschirm::getGraphicsApi() const
+GraphicsApi* Screen::getGraphicsApi() const
 {
     return api ? dynamic_cast<GraphicsApi*>(api->getThis()) : 0;
 }
@@ -393,25 +393,25 @@ Monitor Framework::getMonitor(int id)
     return result;
 }
 
-// Bildschirm2D
+// Screen2D
 // Constructor
-Bildschirm2D::Bildschirm2D(WFenster* fenster)
-    : Bildschirm(fenster)
+Screen2D::Screen2D(NativeWindow* fenster)
+    : Screen(fenster)
 {
     api = new DirectX9();
-    api->initialize(dynamic_cast<WFenster*>(fenster->getThis()),
+    api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
         fenster->getKoerperGroesse(),
         0);
 }
 
 // Destructor
-Bildschirm2D::~Bildschirm2D() {}
+Screen2D::~Screen2D() {}
 
-void Bildschirm2D::render() // Draws the image
+void Screen2D::render() // Draws the image
 {
     if (!rend && testRend) return;
     rendering = 1;
-    Bild* ui = api->zUIRenderBild();
+    Image* ui = api->zUIRenderImage();
     if (ui)
     {
         lock();
@@ -450,10 +450,10 @@ void Bildschirm2D::render() // Draws the image
     rend = 0;
 }
 
-// Bildschirm3D
+// Screen3D
 // Constructor
-Bildschirm3D::Bildschirm3D(WFenster* fenster)
-    : Bildschirm(fenster),
+Screen3D::Screen3D(NativeWindow* fenster)
+    : Screen(fenster),
       kameras(new RCArray<Kam3D>()),
       rend3D(0)
 {
@@ -463,43 +463,43 @@ Bildschirm3D::Bildschirm3D(WFenster* fenster)
         api = new DirectX11();
     else
         api = new DirectX9();
-    api->initialize(dynamic_cast<WFenster*>(fenster->getThis()),
+    api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
         fenster->getKoerperGroesse(),
         0);
 }
 
-Bildschirm3D::Bildschirm3D(WFenster* fenster, GraphicApiType apiTyp)
-    : Bildschirm(fenster),
+Screen3D::Screen3D(NativeWindow* fenster, GraphicApiType apiTyp)
+    : Screen(fenster),
       kameras(new RCArray<Kam3D>()),
       rend3D(0)
 {
     if (apiTyp == DIRECTX9) api = new DirectX9();
     if (apiTyp == DIRECTX11) api = new DirectX11();
     if (apiTyp == DIRECTX12) api = new DirectX12();
-    api->initialize(dynamic_cast<WFenster*>(fenster->getThis()),
+    api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
         fenster->getKoerperGroesse(),
         0);
 }
 
-Bildschirm3D::Bildschirm3D(WFenster* fenster, GraphicsApi* api)
-    : Bildschirm(fenster),
+Screen3D::Screen3D(NativeWindow* fenster, GraphicsApi* api)
+    : Screen(fenster),
       kameras(new RCArray<Kam3D>()),
       rend3D(0)
 {
     this->api = api;
-    api->initialize(dynamic_cast<WFenster*>(fenster->getThis()),
+    api->initialize(dynamic_cast<NativeWindow*>(fenster->getThis()),
         fenster->getKoerperGroesse(),
         0);
 }
 
 // Destructor
-Bildschirm3D::~Bildschirm3D()
+Screen3D::~Screen3D()
 {
     kameras->release();
 }
 
 // non-constant
-void Bildschirm3D::addKamera(Kam3D* obj) // Adds a camera
+void Screen3D::addKamera(Kam3D* obj) // Adds a camera
 {
     lock();
     kameras->add(obj);
@@ -507,7 +507,7 @@ void Bildschirm3D::addKamera(Kam3D* obj) // Adds a camera
     unlock();
 }
 
-void Bildschirm3D::removeKamera(Kam3D* zObj) // Removes a camera
+void Screen3D::removeKamera(Kam3D* zObj) // Removes a camera
 {
     lock();
     for (int i = 0; kameras->z(i); i++)
@@ -522,7 +522,7 @@ void Bildschirm3D::removeKamera(Kam3D* zObj) // Removes a camera
     unlock();
 }
 
-void Bildschirm3D::tick(double tickval)
+void Screen3D::tick(double tickval)
 {
     lock();
     __super::tick(tickval);
@@ -552,7 +552,7 @@ void Bildschirm3D::tick(double tickval)
     }
 }
 
-void Bildschirm3D::doMausEreignis(MausEreignis& me) // sends mouse event
+void Screen3D::doMausEreignis(MausEreignis& me) // sends mouse event
 {
     if (handleUserInputsOnTick)
     {
@@ -570,7 +570,7 @@ void Bildschirm3D::doMausEreignis(MausEreignis& me) // sends mouse event
     }
 }
 
-void Bildschirm3D::doTastaturEreignis(
+void Screen3D::doTastaturEreignis(
 TastaturEreignis& te) // sends keyboard event
 {
     if (handleUserInputsOnTick)
@@ -589,7 +589,7 @@ TastaturEreignis& te) // sends keyboard event
     }
 }
 
-void Bildschirm3D::render() // Draws the image
+void Screen3D::render() // Draws the image
 {
     rendering = 1;
     lock();
@@ -606,7 +606,7 @@ void Bildschirm3D::render() // Draws the image
         rend3D = 0;
     }
     // render User Interface
-    Bild* ui = api->zUIRenderBild();
+    Image* ui = api->zUIRenderImage();
     if ((rend || !testRend) && ui)
     {
         if (renderDrawables)

Screen.h

@@ -1,5 +1,5 @@
-#ifndef Bildschirm_H
-#define Bildschirm_H
+#ifndef Screen_H
+#define Screen_H
 
 #include <queue>
 
@@ -33,9 +33,9 @@ struct _D3DLOCKED_RECT;
 
 namespace Framework
 {
-    class Bild;              //! Image.h
-    class WFenster;          //! Window.h
-    class Bildschirm;        //! from this file
+    class Image;              //! Image.h
+    class NativeWindow;          //! Window.h
+    class Screen;        //! from this file
     class Drawable;         //! Drawing.h
     class Drawable3D;       //! Drawing3D.h
     class ZeitMesser;        //! Time.h
@@ -71,11 +71,11 @@ namespace Framework
     };
 
     //! This class manages the image on the screen
-    class Bildschirm : public virtual ReferenceCounter
+    class Screen : public virtual ReferenceCounter
     {
     protected:
         GraphicsApi* api;
-        WFenster* fenster;
+        NativeWindow* fenster;
         RCArray<Drawable>* members;
         int fillColor;
         int deckFarbe;
@@ -98,9 +98,9 @@ namespace Framework
     public:
         //! Constructor
         //! \param fenster The window whose content should be managed
-        DLLEXPORT Bildschirm(WFenster* fenster);
+        DLLEXPORT Screen(NativeWindow* fenster);
         //! Destructor
-        DLLEXPORT virtual ~Bildschirm();
+        DLLEXPORT virtual ~Screen();
         //! Passes a void function pointer to an action that should be executed
         //! once by the main thread. Called at the beginning of tick()
         DLLEXPORT void postAction(std::function<void()> action);
@@ -186,10 +186,10 @@ namespace Framework
         DLLEXPORT virtual void addToolTip(ToolTip* tip);
         //! Returns the image into which the 2D GUI drawings of the framework
         //! are drawn
-        DLLEXPORT virtual Bild* getRenderBild() const;
+        DLLEXPORT virtual Image* getRenderImage() const;
         //! Returns the image without increased reference counter into which
         //! the 2D GUI drawings of the framework are drawn
-        DLLEXPORT virtual Bild* zRenderBild() const;
+        DLLEXPORT virtual Image* zRenderImage() const;
         //! Returns an array of 2D GUI drawings in the image
         DLLEXPORT virtual ArrayIterator<Drawable*> getMembers() const;
         //! Returns the color in A8R8G8B8 format used to fill the image
@@ -210,20 +210,20 @@ namespace Framework
     };
 #ifdef WIN32
     //! This class manages the image on the screen without 3D elements
-    class Bildschirm2D : public Bildschirm
+    class Screen2D : public Screen
     {
     public:
         //! Constructor
         //! \param fenster The window whose content should be managed
-        DLLEXPORT Bildschirm2D(WFenster* fenster);
+        DLLEXPORT Screen2D(NativeWindow* fenster);
         //! Destructor
-        DLLEXPORT virtual ~Bildschirm2D();
+        DLLEXPORT virtual ~Screen2D();
         //! Draws an image and presents it on the screen
         DLLEXPORT virtual void render();
     };
 
     //! This class manages the image on the screen with 3D elements
-    class Bildschirm3D : public Bildschirm
+    class Screen3D : public Screen
     {
     private:
         RCArray<Kam3D>* kameras;
@@ -232,11 +232,11 @@ namespace Framework
     public:
         //! Constructor
         //! \param fenster The window whose content should be managed
-        DLLEXPORT Bildschirm3D(WFenster* fenster);
-        DLLEXPORT Bildschirm3D(WFenster* fenster, GraphicApiType apiTyp);
-        DLLEXPORT Bildschirm3D(WFenster* fenster, GraphicsApi* api);
+        DLLEXPORT Screen3D(NativeWindow* fenster);
+        DLLEXPORT Screen3D(NativeWindow* fenster, GraphicApiType apiTyp);
+        DLLEXPORT Screen3D(NativeWindow* fenster, GraphicsApi* api);
         //! Destructor
-        DLLEXPORT virtual ~Bildschirm3D();
+        DLLEXPORT virtual ~Screen3D();
         //! Adds a camera to the screen
         //! \param obj The camera
         DLLEXPORT void addKamera(Kam3D* obj);

Scroll.cpp

@@ -200,7 +200,7 @@ bool VScrollBar::doMausMessage(int x, int y, int br, int hi, MausEreignis& me)
     return ret;
 }
 
-void VScrollBar::render(int x, int y, int br, int hi, Bild& zRObj) const
+void VScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
 {
     if (bg) zRObj.alphaRegion(x, y, br, hi, bgFarbe);
     --br;
@@ -300,7 +300,7 @@ bool HScrollBar::doMausMessage(int x, int y, int br, int hi, MausEreignis& me)
     return ret;
 }
 
-void HScrollBar::render(int x, int y, int br, int hi, Bild& zRObj) const
+void HScrollBar::render(int x, int y, int br, int hi, Image& zRObj) const
 {
     if (bg) zRObj.alphaRegion(x, y, br, hi, bgFarbe);
     --br;

Scroll.h

@@ -6,7 +6,7 @@
 
 namespace Framework
 {
-    class Bild;          //! Image.h
+    class Image;          //! Image.h
     struct MausEreignis; //! MouseEvent.h
 
     struct ScrollData
@@ -73,7 +73,7 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \param zRObj The image to draw into
         DLLEXPORT virtual void render(
-            int x, int y, int br, int hi, Bild& zRObj) const = 0;
+            int x, int y, int br, int hi, Image& zRObj) const = 0;
         //! Returns a pointer to the scroll data
         DLLEXPORT ScrollData* getScrollData() const;
         //! Returns the scroll speed. The number of pixels scrolled per click
@@ -111,7 +111,7 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \param zRObj The image to draw into
         DLLEXPORT void render(
-            int x, int y, int br, int hi, Bild& zRObj) const override;
+            int x, int y, int br, int hi, Image& zRObj) const override;
     };
 
     //! A horizontal scrollbar, as used in some 2D GUI drawings of the
@@ -139,7 +139,7 @@ namespace Framework
         //! \param hi The height of the scroll bar
         //! \param zRObj The image to draw into
         DLLEXPORT void render(
-            int x, int y, int br, int hi, Bild& zRObj) const override;
+            int x, int y, int br, int hi, Image& zRObj) const override;
     };
 } // namespace Framework
 

SelectionBox.cpp

@@ -20,21 +20,21 @@ AuswahlBox::AuswahlBox()
     : DrawableBackground(),
       textRd(0),
       msStyle(0),
-      members(new RCArray<TextFeld>()),
+      members(new RCArray<TextField>()),
       ausfahren(new Knopf()),
-      auswRahmen(new LRahmen()),
+      selBorder(new LBorder()),
       auswBgF(0xFF000000),
       auswBgB(0),
       auswAf(new AlphaFeld()),
-      msAuswRahmen(0),
+      msSelBorder(0),
       msAuswBgF(0),
       msAuswBgB(0),
       msAuswAf(0),
-      mausRahmen(new LRahmen()),
+      mouseBorder(new LBorder()),
       mausBgF(0xFF000000),
       mausBgB(0),
       mausAf(new AlphaFeld()),
-      msMausRahmen(0),
+      msMouseBorder(0),
       msMausBgF(0),
       msMausBgB(0),
       msMausAf(0),
@@ -52,7 +52,7 @@ AuswahlBox::AuswahlBox()
 {
     vertikalScrollBar = new VScrollBar();
     style = Style::Normal;
-    rahmen = new LRahmen();
+    rahmen = new LBorder();
     rahmen->setFarbe(0xFFFFFFFF);
     rahmen->setRamenBreite(1);
     ausfahren->setStyle(Knopf::Style::Sichtbar | Knopf::Style::Erlaubt
@@ -62,12 +62,12 @@ AuswahlBox::AuswahlBox()
     ausfahren->setSize(18, 18);
     ausfahren->setSchriftFarbe(0xFFFFFFFF);
     ausfahren->setText("\\/");
-    auswRahmen->setFarbe(0xFF00FF00);
-    auswRahmen->setRamenBreite(1);
+    selBorder->setFarbe(0xFF00FF00);
+    selBorder->setRamenBreite(1);
     auswAf->setFarbe(0xA000FF00);
     auswAf->setStrength(7);
-    mausRahmen->setFarbe(0xFF00FF00);
-    mausRahmen->setRamenBreite(1);
+    mouseBorder->setFarbe(0xFF00FF00);
+    mouseBorder->setRamenBreite(1);
     mausAf->setFarbe(0x5000FF00);
     mausAf->setStrength(7);
     gr.x = 20;
@@ -81,17 +81,17 @@ AuswahlBox::~AuswahlBox()
     if (msStyle) msStyle->release();
     if (members) members->release();
     if (ausfahren) ausfahren->release();
-    if (auswRahmen) auswRahmen->release();
+    if (selBorder) selBorder->release();
     if (auswBgB) auswBgB->release();
     if (auswAf) auswAf->release();
-    if (msAuswRahmen) msAuswRahmen->release();
+    if (msSelBorder) msSelBorder->release();
     if (msAuswAf) msAuswAf->release();
     if (msAuswBgB) msAuswBgB->release();
     if (msAuswBgF) msAuswBgF->release();
-    if (mausRahmen) mausRahmen->release();
+    if (mouseBorder) mouseBorder->release();
     if (mausAf) mausAf->release();
     if (mausBgB) mausBgB->release();
-    if (msMausRahmen) msMausRahmen->release();
+    if (msMouseBorder) msMouseBorder->release();
     if (msMausAf) msMausAf->release();
     if (msMausBgB) msMausBgB->release();
     if (msMausBgF) msMausBgF->release();
@@ -131,7 +131,7 @@ void AuswahlBox::doMausEreignis(MausEreignis& me, bool userRet) // mouse events
         && scrollAnzeigen)
     {
         int rbr = 0;
-        if (rahmen && hatStyle(Style::Rahmen)) rbr = rahmen->getRBreite();
+        if (rahmen && hatStyle(Style::Border)) rbr = rahmen->getRBreite();
         if ((me.mx > gr.x - 15 - rbr && me.my > gr.y) || me.id == ME_UScroll
             || me.id == ME_DScroll)
         {
@@ -205,13 +205,13 @@ void AuswahlBox::setEventAktion(
     this->eAk = event;
 }
 
-void AuswahlBox::setSchriftZ(Schrift* schrift) // set font
+void AuswahlBox::setFontZ(Font* schrift) // set font
 {
     if (!this->textRd)
         textRd = new TextRenderer(schrift);
     else
-        textRd->setSchriftZ(schrift);
-    ausfahren->setSchriftZ(dynamic_cast<Schrift*>(schrift->getThis()));
+        textRd->setFontZ(schrift);
+    ausfahren->setFontZ(dynamic_cast<Font*>(schrift->getThis()));
     rend = 1;
 }
 
@@ -223,13 +223,13 @@ void AuswahlBox::setTextRendererZ(TextRenderer* textRd)
 
 void AuswahlBox::addEintrag(const char* txt) // add entry
 {
-    TextFeld* tf = new TextFeld();
-    if (textRd) tf->setSchriftZ(textRd->getSchrift());
-    tf->addStyle(TextFeld::Style::Sichtbar | TextFeld::Style::Center
-                 | TextFeld::Style::Rahmen);
+    TextField* tf = new TextField();
+    if (textRd) tf->setFontZ(textRd->getFont());
+    tf->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+                 | TextField::Style::Border);
     tf->setText(txt);
     tf->setSchriftFarbe(0xFFFFFFFF);
-    tf->setRahmenFarbe(0xFFFFFFFF);
+    tf->setBorderColor(0xFFFFFFFF);
     tf->setSize(0, eintragHeight);
     members->add(tf, anzahl);
     ++anzahl;
@@ -238,20 +238,20 @@ void AuswahlBox::addEintrag(const char* txt) // add entry
 
 void AuswahlBox::addEintrag(Text* txt)
 {
-    TextFeld* tf = new TextFeld();
-    if (textRd) tf->setSchriftZ(textRd->getSchrift());
-    tf->addStyle(TextFeld::Style::Sichtbar | TextFeld::Style::Center
-                 | TextFeld::Style::Rahmen);
+    TextField* tf = new TextField();
+    if (textRd) tf->setFontZ(textRd->getFont());
+    tf->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+                 | TextField::Style::Border);
     tf->setText(txt);
     tf->setSchriftFarbe(0xFFFFFFFF);
-    tf->setRahmenFarbe(0xFFFFFFFF);
+    tf->setBorderColor(0xFFFFFFFF);
     tf->setSize(0, eintragHeight);
     members->add(tf, anzahl);
     ++anzahl;
     rend = 1;
 }
 
-void AuswahlBox::addEintragZ(TextFeld* txt)
+void AuswahlBox::addEintragZ(TextField* txt)
 {
     members->add(txt, anzahl);
     ++anzahl;
@@ -273,7 +273,7 @@ void AuswahlBox::setEintrag(int i, Text* txt)
     rend = 1;
 }
 
-void AuswahlBox::setEintragZ(int i, TextFeld* txt)
+void AuswahlBox::setEintragZ(int i, TextField* txt)
 {
     if (i < anzahl)
         members->set(txt, i);
@@ -288,11 +288,11 @@ void AuswahlBox::removeEintrag(int i) // remove entry
     {
         members->remove(i);
         if (msStyle) msStyle->remove(i);
-        if (msAuswRahmen) msAuswRahmen->remove(i);
+        if (msSelBorder) msSelBorder->remove(i);
         if (msAuswBgF) msAuswBgF->remove(i);
         if (msAuswBgB) msAuswBgB->remove(i);
         if (msAuswAf) msAuswAf->remove(i);
-        if (msMausRahmen) msMausRahmen->remove(i);
+        if (msMouseBorder) msMouseBorder->remove(i);
         if (msMausBgF) msMausBgF->remove(i);
         if (msMausBgB) msMausBgB->remove(i);
         if (msMausAf) msMausAf->remove(i);
@@ -310,10 +310,10 @@ void AuswahlBox::setAusklappKnopfZ(Knopf* ausK) // set expand button
     rend = 1;
 }
 
-void AuswahlBox::setEintragRahmenZ(int i, Rahmen* rahmen) // set entry border
+void AuswahlBox::setEntryBorderZ(int i, Border* rahmen) // set entry border
 {
     if (members->z(i))
-        members->z(i)->setRahmenZ(rahmen);
+        members->z(i)->setBorderZ(rahmen);
     else
         rahmen->release();
     rend = 1;
@@ -321,14 +321,14 @@ void AuswahlBox::setEintragRahmenZ(int i, Rahmen* rahmen) // set entry border
 
 void AuswahlBox::setEintragRahmenFarbe(int i, int f) // set entry border color
 {
-    if (members->z(i)) members->z(i)->setRahmenFarbe(f);
+    if (members->z(i)) members->z(i)->setBorderColor(f);
     rend = 1;
 }
 
 void AuswahlBox::setEintragRahmenBreite(
     int i, int rbr) // set entry border width
 {
-    if (members->z(i)) members->z(i)->setRahmenBreite(rbr);
+    if (members->z(i)) members->z(i)->setBorderWidth(rbr);
     rend = 1;
 }
 
@@ -339,20 +339,20 @@ void AuswahlBox::setEintragHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setEintragHintergrundBildZ(
-    int i, Bild* bgB) // set entry background image
+void AuswahlBox::setEintragHintergrundImageZ(
+    int i, Image* bgB) // set entry background image
 {
     if (members->z(i))
-        members->z(i)->setHintergrundBildZ(bgB);
+        members->z(i)->setHintergrundImageZ(bgB);
     else
         bgB->release();
     rend = 1;
 }
 
-void AuswahlBox::setEintragHintergrundBild(int i, Bild* bgB)
+void AuswahlBox::setEintragHintergrundImage(int i, Image* bgB)
 {
     if (members->z(i))
-        members->z(i)->setHintergrundBild(bgB);
+        members->z(i)->setHintergrundImage(bgB);
     else
         bgB->release();
     rend = 1;
@@ -379,24 +379,24 @@ void AuswahlBox::setEintragAlphaFeldStrength(
     rend = 1;
 }
 
-void AuswahlBox::setAuswRahmenZ(Rahmen* rahmen) // set selection border
+void AuswahlBox::setSelBorderZ(Border* rahmen) // set selection border
 {
-    if (auswRahmen) auswRahmen->release();
-    auswRahmen = rahmen;
+    if (selBorder) selBorder->release();
+    selBorder = rahmen;
     rend = 1;
 }
 
 void AuswahlBox::setAuswRahmenFarbe(int f) // set selection border color
 {
-    if (!auswRahmen) auswRahmen = new LRahmen();
-    auswRahmen->setFarbe(f);
+    if (!selBorder) selBorder = new LBorder();
+    selBorder->setFarbe(f);
     rend = 1;
 }
 
 void AuswahlBox::setAuswRahmenBreite(int rbr) // set selection border width
 {
-    if (!auswRahmen) auswRahmen = new LRahmen();
-    auswRahmen->setRamenBreite(rbr);
+    if (!selBorder) selBorder = new LBorder();
+    selBorder->setRamenBreite(rbr);
     rend = 1;
 }
 
@@ -407,19 +407,19 @@ void AuswahlBox::setAuswHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setAuswHintergrundBildZ(
-    Bild* bgB) // set selection background image
+void AuswahlBox::setAuswHintergrundImageZ(
+    Image* bgB) // set selection background image
 {
     if (auswBgB) auswBgB->release();
     auswBgB = bgB;
     rend = 1;
 }
 
-void AuswahlBox::setAuswHintergrundBild(Bild* bgB)
+void AuswahlBox::setAuswHintergrundImage(Image* bgB)
 {
-    if (!auswBgB) auswBgB = new Bild();
-    auswBgB->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-    auswBgB->drawBild(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+    if (!auswBgB) auswBgB = new Image();
+    auswBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+    auswBgB->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
     bgB->release();
     rend = 1;
 }
@@ -446,16 +446,16 @@ void AuswahlBox::setAuswAlphaFeldStrength(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswRahmenZ(
-    int i, Rahmen* rahmen) // set multistyle selection border
+void AuswahlBox::setMsSelBorderZ(
+    int i, Border* rahmen) // set multistyle selection border
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         rahmen->release();
         return;
     }
-    if (!msAuswRahmen) msAuswRahmen = new RCArray<Rahmen>();
-    msAuswRahmen->set(rahmen, i);
+    if (!msSelBorder) msSelBorder = new RCArray<Border>();
+    msSelBorder->set(rahmen, i);
     rend = 1;
 }
 
@@ -463,9 +463,9 @@ void AuswahlBox::setMsAuswRahmenFarbe(
     int i, int f) // set multistyle selection border color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswRahmen) msAuswRahmen = new RCArray<Rahmen>();
-    if (!msAuswRahmen->z(i)) msAuswRahmen->set(new LRahmen(), i);
-    msAuswRahmen->z(i)->setFarbe(f);
+    if (!msSelBorder) msSelBorder = new RCArray<Border>();
+    if (!msSelBorder->z(i)) msSelBorder->set(new LBorder(), i);
+    msSelBorder->z(i)->setFarbe(f);
     rend = 1;
 }
 
@@ -473,9 +473,9 @@ void AuswahlBox::setMsAuswRahmenBreite(
     int i, int rbr) // set multistyle selection width
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msAuswRahmen) msAuswRahmen = new RCArray<Rahmen>();
-    if (!msAuswRahmen->z(i)) msAuswRahmen->set(new LRahmen(), i);
-    msAuswRahmen->z(i)->setRamenBreite(rbr);
+    if (!msSelBorder) msSelBorder = new RCArray<Border>();
+    if (!msSelBorder->z(i)) msSelBorder->set(new LBorder(), i);
+    msSelBorder->z(i)->setRamenBreite(rbr);
     rend = 1;
 }
 
@@ -488,38 +488,38 @@ void AuswahlBox::setMsAuswHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswHintergrundBildZ(
-    int i, Bild* bgB) // set multistyle selection background image
+void AuswahlBox::setMsAuswHintergrundImageZ(
+    int i, Image* bgB) // set multistyle selection background image
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msAuswBgB) msAuswBgB = new RCArray<Bild>();
+    if (!msAuswBgB) msAuswBgB = new RCArray<Image>();
     msAuswBgB->set(bgB, i);
     rend = 1;
 }
 
-void AuswahlBox::setMsAuswHintergrundBild(int i, Bild* bgB)
+void AuswahlBox::setMsAuswHintergrundImage(int i, Image* bgB)
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msAuswBgB) msAuswBgB = new RCArray<Bild>();
+    if (!msAuswBgB) msAuswBgB = new RCArray<Image>();
     if (!msAuswBgB->z(i))
     {
-        Bild* z = new Bild;
-        z->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-        z->drawBild(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+        Image* z = new Image;
+        z->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+        z->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
         msAuswBgB->set(z, i);
     }
     else
     {
-        msAuswBgB->z(i)->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-        msAuswBgB->z(i)->drawBild(
+        msAuswBgB->z(i)->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+        msAuswBgB->z(i)->drawImage(
             0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
     }
     bgB->release();
@@ -559,24 +559,24 @@ void AuswahlBox::setMsAuswAlphaFeldStrength(
     rend = 1;
 }
 
-void AuswahlBox::setMausRahmenZ(Rahmen* rahmen) // set mouse border
+void AuswahlBox::setMouseBorderZ(Border* rahmen) // set mouse border
 {
-    if (mausRahmen) mausRahmen->release();
-    mausRahmen = rahmen;
+    if (mouseBorder) mouseBorder->release();
+    mouseBorder = rahmen;
     rend = 1;
 }
 
 void AuswahlBox::setMausRahmenFarbe(int f) // set mouse border color
 {
-    if (!mausRahmen) mausRahmen = new LRahmen();
-    mausRahmen->setFarbe(f);
+    if (!mouseBorder) mouseBorder = new LBorder();
+    mouseBorder->setFarbe(f);
     rend = 1;
 }
 
 void AuswahlBox::setMausRahmenBreite(int rbr) // set mouse border width
 {
-    if (!mausRahmen) mausRahmen = new LRahmen();
-    mausRahmen->setRamenBreite(rbr);
+    if (!mouseBorder) mouseBorder = new LBorder();
+    mouseBorder->setRamenBreite(rbr);
     rend = 1;
 }
 
@@ -586,19 +586,19 @@ void AuswahlBox::setMausHintergrundFarbe(int f) // set mouse background color
     rend = 1;
 }
 
-void AuswahlBox::setMausHintergrundBildZ(
-    Bild* bgB) // set mouse background image
+void AuswahlBox::setMausHintergrundImageZ(
+    Image* bgB) // set mouse background image
 {
     if (mausBgB) mausBgB->release();
     mausBgB = bgB;
     rend = 1;
 }
 
-void AuswahlBox::setMausHintergrundBild(Bild* bgB)
+void AuswahlBox::setMausHintergrundImage(Image* bgB)
 {
-    if (!mausBgB) mausBgB = new Bild();
-    mausBgB->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-    mausBgB->drawBild(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+    if (!mausBgB) mausBgB = new Image();
+    mausBgB->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+    mausBgB->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
     bgB->release();
     rend = 1;
 }
@@ -625,16 +625,16 @@ void AuswahlBox::setMausAlphaFeldStrength(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausRahmenZ(
-    int i, Rahmen* rahmen) // set multistyle mouse border
+void AuswahlBox::setMsMouseBorderZ(
+    int i, Border* rahmen) // set multistyle mouse border
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         rahmen->release();
         return;
     }
-    if (!msMausRahmen) msMausRahmen = new RCArray<Rahmen>();
-    msMausRahmen->set(rahmen, i);
+    if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
+    msMouseBorder->set(rahmen, i);
     rend = 1;
 }
 
@@ -642,9 +642,9 @@ void AuswahlBox::setMsMausRahmenFarbe(
     int i, int f) // set multistyle mouse border color
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausRahmen) msMausRahmen = new RCArray<Rahmen>();
-    if (!msMausRahmen->z(i)) msMausRahmen->set(new LRahmen(), i);
-    msMausRahmen->z(i)->setFarbe(f);
+    if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
+    if (!msMouseBorder->z(i)) msMouseBorder->set(new LBorder(), i);
+    msMouseBorder->z(i)->setFarbe(f);
     rend = 1;
 }
 
@@ -652,9 +652,9 @@ void AuswahlBox::setMsMausRahmenBreite(
     int i, int rbr) // set multistyle mouse border width
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl) return;
-    if (!msMausRahmen) msMausRahmen = new RCArray<Rahmen>();
-    if (!msMausRahmen->z(i)) msMausRahmen->set(new LRahmen(), i);
-    msMausRahmen->z(i)->setRamenBreite(rbr);
+    if (!msMouseBorder) msMouseBorder = new RCArray<Border>();
+    if (!msMouseBorder->z(i)) msMouseBorder->set(new LBorder(), i);
+    msMouseBorder->z(i)->setRamenBreite(rbr);
     rend = 1;
 }
 
@@ -667,38 +667,38 @@ void AuswahlBox::setMsMausHintergrundFarbe(
     rend = 1;
 }
 
-void AuswahlBox::setMsMausHintergrundBildZ(
-    int i, Bild* bgB) // set multistyle mouse background image
+void AuswahlBox::setMsMausHintergrundImageZ(
+    int i, Image* bgB) // set multistyle mouse background image
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msMausBgB) msMausBgB = new RCArray<Bild>();
+    if (!msMausBgB) msMausBgB = new RCArray<Image>();
     msMausBgB->set(bgB, i);
     rend = 1;
 }
 
-void AuswahlBox::setMsMausHintergrundBild(int i, Bild* bgB)
+void AuswahlBox::setMsMausHintergrundImage(int i, Image* bgB)
 {
     if (hatStyleNicht(Style::MultiStyled) || i >= anzahl)
     {
         bgB->release();
         return;
     }
-    if (!msMausBgB) msMausBgB = new RCArray<Bild>();
+    if (!msMausBgB) msMausBgB = new RCArray<Image>();
     if (!msMausBgB->z(i))
     {
-        Bild* z = new Bild;
-        z->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-        z->drawBild(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
+        Image* z = new Image;
+        z->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+        z->drawImage(0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
         msMausBgB->set(z, i);
     }
     else
     {
-        msMausBgB->z(i)->neuBild(bgB->getBreite(), bgB->getHeight(), 0);
-        msMausBgB->z(i)->drawBild(
+        msMausBgB->z(i)->neuImage(bgB->getBreite(), bgB->getHeight(), 0);
+        msMausBgB->z(i)->drawImage(
             0, 0, bgB->getBreite(), bgB->getHeight(), *bgB);
     }
     bgB->release();
@@ -919,7 +919,7 @@ void AuswahlBox::doTastaturEreignis(TastaturEreignis& te) // Keyboard
     if (te.verarbeitet && nTak) te.verarbeitet = nTak(ntakParam, this, te);
 }
 
-void AuswahlBox::render(Bild& zRObj) // renders into zRObj
+void AuswahlBox::render(Image& zRObj) // renders into zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -934,7 +934,7 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
             return;
         }
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) // Draw border
+        if (hatStyle(Style::Border) && rahmen) // Draw border
         {
             rahmen->setSize(br, hi);
             rahmen->render(zRObj);
@@ -956,12 +956,12 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                 zRObj.alphaRegion(0, 0, br, hi, hintergrundFarbe);
             else
                 zRObj.fillRegion(0, 0, br, hi, hintergrundFarbe);
-            if (hatStyle(Style::HBild) && hintergrundBild)
+            if (hatStyle(Style::HImage) && hintergrundImage)
             {
                 if (hatStyle(Style::HAlpha))
-                    zRObj.alphaBild(0, 0, br, hi, *hintergrundBild);
+                    zRObj.alphaImage(0, 0, br, hi, *hintergrundImage);
                 else
-                    zRObj.drawBild(0, 0, br, hi, *hintergrundBild);
+                    zRObj.drawImage(0, 0, br, hi, *hintergrundImage);
             }
         }
         if (hatStyle(Style::Buffered) && hintergrundFeld)
@@ -987,17 +987,17 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                 auswahl = anzahl - 1;
                 if (eAk) eAk(eAkP, this, 0, auswahl);
             }
-            TextFeld* tf = auswahl >= 0 ? members->z(auswahl) : 0;
+            TextField* tf = auswahl >= 0 ? members->z(auswahl) : 0;
             if (tf)
             {
                 AlphaFeld* tmpBuffer = 0;
                 bool tmpB = 0;
                 int tmpHFarbe = 0;
                 bool tmpH = 0;
-                Bild* tmpHBild = 0;
+                Image* tmpHImage = 0;
                 bool tmpHB = 0;
                 bool tmpHAlpha = 0;
-                Rahmen* tmpRahmen = 0;
+                Border* tmpBorder = 0;
                 bool tmpR = 0;
                 if (hatStyleNicht(Style::MultiStyled) || !msStyle)
                 {
@@ -1006,41 +1006,41 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         tmpBuffer = tf->getAlphaFeld();
                         tf->setAlphaFeldZ(
                             dynamic_cast<AlphaFeld*>(auswAf->getThis()));
-                        tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                        tf->setStyle(TextFeld::Style::Buffered,
+                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tf->setStyle(TextField::Style::Buffered,
                             hatStyle(Style::AuswahlBuffer));
                     }
                     if (hatStyle(Style::AuswahlHintergrund))
                     {
-                        tmpH = tf->hatStyle(TextFeld::Style::Hintergrund);
+                        tmpH = tf->hatStyle(TextField::Style::Hintergrund);
                         tmpHFarbe = tf->getHintergrundFarbe();
                         tf->setHintergrundFarbe(auswBgF);
-                        tf->setStyle(TextFeld::Style::Hintergrund,
+                        tf->setStyle(TextField::Style::Hintergrund,
                             hatStyle(Style::Hintergrund));
-                        if (hatStyle(Style::AuswahlHBild))
+                        if (hatStyle(Style::AuswahlHImage))
                         {
-                            tmpHBild = tf->getHintergrundBild();
-                            tf->setHintergrundBildZ(
-                                dynamic_cast<Bild*>(auswBgB->getThis()));
-                            tmpHB = tf->hatStyle(TextFeld::Style::HBild);
+                            tmpHImage = tf->getHintergrundImage();
+                            tf->setHintergrundImageZ(
+                                dynamic_cast<Image*>(auswBgB->getThis()));
+                            tmpHB = tf->hatStyle(TextField::Style::HImage);
                             tf->setStyle(
-                                TextFeld::Style::HBild, hatStyle(Style::HBild));
+                                TextField::Style::HImage, hatStyle(Style::HImage));
                         }
                         if (hatStyle(Style::AuswahlHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextFeld::Style::HAlpha);
-                            tf->setStyle(TextFeld::Style::HAlpha,
+                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tf->setStyle(TextField::Style::HAlpha,
                                 hatStyle(Style::AuswahlHAlpha));
                         }
                     }
-                    if (hatStyle(Style::AuswahlRahmen))
+                    if (hatStyle(Style::SelectionBorder))
                     {
-                        tmpRahmen = tf->getRahmen();
-                        tf->setRahmenZ(
-                            dynamic_cast<Rahmen*>(auswRahmen->getThis()));
-                        tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen,
-                            hatStyle(Style::AuswahlRahmen));
+                        tmpBorder = tf->getBorder();
+                        tf->setBorderZ(
+                            dynamic_cast<Border*>(selBorder->getThis()));
+                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tf->setStyle(TextField::Style::Border,
+                            hatStyle(Style::SelectionBorder));
                     }
                 }
                 else
@@ -1049,44 +1049,44 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                     {
                         tmpBuffer = tf->getAlphaFeld();
                         tf->setAlphaFeldZ(msAuswAf->get(auswahl));
-                        tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                        tf->setStyle(TextFeld::Style::Buffered,
+                        tmpB = tf->hatStyle(TextField::Style::Buffered);
+                        tf->setStyle(TextField::Style::Buffered,
                             hatMsStyle(auswahl, Style::AuswahlBuffer));
                     }
                     if (hatMsStyle(auswahl, Style::AuswahlHintergrund))
                     {
                         tmpH = tf->hatStyle(Style::Hintergrund);
-                        tf->setStyle(TextFeld::Style::Hintergrund,
+                        tf->setStyle(TextField::Style::Hintergrund,
                             hatMsStyle(auswahl, Style::AuswahlHintergrund));
                         if (msAuswBgF && msAuswBgF->hat(auswahl))
                         {
                             tmpHFarbe = tf->getHintergrundFarbe();
                             tf->setHintergrundFarbe(msAuswBgF->get(auswahl));
                         }
-                        if (hatMsStyle(auswahl, Style::AuswahlHBild)
+                        if (hatMsStyle(auswahl, Style::AuswahlHImage)
                             && msAuswBgB)
                         {
-                            tmpHBild = tf->getHintergrundBild();
-                            tf->setHintergrundBildZ(msAuswBgB->get(auswahl));
-                            tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                            tf->setStyle(TextFeld::Style::HBild,
-                                hatMsStyle(auswahl, Style::HBild));
+                            tmpHImage = tf->getHintergrundImage();
+                            tf->setHintergrundImageZ(msAuswBgB->get(auswahl));
+                            tmpHB = tf->hatStyle(TextField::Style::HImage);
+                            tf->setStyle(TextField::Style::HImage,
+                                hatMsStyle(auswahl, Style::HImage));
                         }
                         if (hatMsStyle(auswahl, Style::AuswahlHAlpha))
                         {
-                            tmpHAlpha = tf->hatStyle(TextFeld::Style::HAlpha);
-                            tf->setStyle(TextFeld::Style::HAlpha,
+                            tmpHAlpha = tf->hatStyle(TextField::Style::HAlpha);
+                            tf->setStyle(TextField::Style::HAlpha,
                                 hatMsStyle(auswahl, Style::AuswahlHAlpha));
                         }
                     }
-                    if (hatMsStyle(auswahl, Style::AuswahlRahmen)
-                        && msAuswRahmen)
+                    if (hatMsStyle(auswahl, Style::SelectionBorder)
+                        && msSelBorder)
                     {
-                        tmpRahmen = tf->getRahmen();
-                        tf->setRahmenZ(msAuswRahmen->get(auswahl));
-                        tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen,
-                            hatMsStyle(auswahl, Style::AuswahlRahmen));
+                        tmpBorder = tf->getBorder();
+                        tf->setBorderZ(msSelBorder->get(auswahl));
+                        tmpR = tf->hatStyle(TextField::Style::Border);
+                        tf->setStyle(TextField::Style::Border,
+                            hatMsStyle(auswahl, Style::SelectionBorder));
                     }
                 }
                 int tmpHi = tf->getHeight();
@@ -1101,24 +1101,24 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                     if (hatStyle(Style::AuswahlBuffer))
                     {
                         tf->setAlphaFeldZ(tmpBuffer);
-                        tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                        tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatStyle(Style::AuswahlHintergrund))
                     {
                         tf->setHintergrundFarbe(tmpHFarbe);
-                        tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
-                        if (hatStyle(Style::AuswahlHBild))
+                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
+                        if (hatStyle(Style::AuswahlHImage))
                         {
-                            tf->setHintergrundBildZ(tmpHBild);
-                            tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
                         if (hatStyle(Style::AuswahlHAlpha))
-                            tf->setStyle(TextFeld::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatStyle(Style::AuswahlRahmen))
+                    if (hatStyle(Style::SelectionBorder))
                     {
-                        tf->setRahmenZ(tmpRahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                        tf->setBorderZ(tmpBorder);
+                        tf->setStyle(TextField::Style::Border, tmpR);
                     }
                 }
                 else
@@ -1126,27 +1126,27 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                     if (hatMsStyle(auswahl, Style::AuswahlBuffer) && msAuswAf)
                     {
                         tf->setAlphaFeldZ(tmpBuffer);
-                        tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                        tf->setStyle(TextField::Style::Buffered, tmpB);
                     }
                     if (hatMsStyle(auswahl, Style::AuswahlHintergrund))
                     {
-                        tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
+                        tf->setStyle(TextField::Style::Hintergrund, tmpH);
                         if (msAuswBgF && msAuswBgF->hat(auswahl))
                             tf->setHintergrundFarbe(tmpHFarbe);
-                        if (hatMsStyle(auswahl, Style::AuswahlHBild)
+                        if (hatMsStyle(auswahl, Style::AuswahlHImage)
                             && msAuswBgB)
                         {
-                            tf->setHintergrundBildZ(tmpHBild);
-                            tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                            tf->setHintergrundImageZ(tmpHImage);
+                            tf->setStyle(TextField::Style::HImage, tmpHB);
                         }
                         if (hatMsStyle(auswahl, Style::AuswahlHAlpha))
-                            tf->setStyle(TextFeld::Style::HAlpha, tmpHAlpha);
+                            tf->setStyle(TextField::Style::HAlpha, tmpHAlpha);
                     }
-                    if (hatMsStyle(auswahl, Style::AuswahlRahmen)
-                        && msAuswRahmen)
+                    if (hatMsStyle(auswahl, Style::SelectionBorder)
+                        && msSelBorder)
                     {
-                        tf->setRahmenZ(tmpRahmen);
-                        tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                        tf->setBorderZ(tmpBorder);
+                        tf->setStyle(TextField::Style::Border, tmpR);
                     }
                 }
             }
@@ -1187,7 +1187,7 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
             anzahl = members->getEintragAnzahl();
             for (int i = 0; i < anzahl; ++i)
             {
-                TextFeld* tf = members->z(i);
+                TextField* tf = members->z(i);
                 if (dy >= mdy && !vsb) break;
                 tf->setPosition(0, dy);
                 tf->setSize(br - rbr * 2, tf->getHeight());
@@ -1197,10 +1197,10 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                 bool tmpB = 0;
                 int tmpHFarbe = 0;
                 bool tmpH = 0;
-                Bild* tmpHBild = 0;
+                Image* tmpHImage = 0;
                 bool tmpHB = 0;
                 bool tmpHAlpha = 0;
-                Rahmen* tmpRahmen = 0;
+                Border* tmpBorder = 0;
                 bool tmpR = 0;
                 if (selected)
                 {
@@ -1211,42 +1211,42 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                             tmpBuffer = tf->getAlphaFeld();
                             tf->setAlphaFeldZ(
                                 dynamic_cast<AlphaFeld*>(auswAf->getThis()));
-                            tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                            tf->setStyle(TextFeld::Style::Buffered,
+                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setStyle(TextField::Style::Buffered,
                                 hatStyle(Style::AuswahlBuffer));
                         }
                         if (hatStyle(Style::AuswahlHintergrund))
                         {
-                            tmpH = tf->hatStyle(TextFeld::Style::Hintergrund);
+                            tmpH = tf->hatStyle(TextField::Style::Hintergrund);
                             tmpHFarbe = tf->getHintergrundFarbe();
                             tf->setHintergrundFarbe(auswBgF);
-                            tf->setStyle(TextFeld::Style::Hintergrund,
+                            tf->setStyle(TextField::Style::Hintergrund,
                                 hatStyle(Style::Hintergrund));
-                            if (hatStyle(Style::AuswahlHBild))
+                            if (hatStyle(Style::AuswahlHImage))
                             {
-                                tmpHBild = tf->getHintergrundBild();
-                                tf->setHintergrundBildZ(
-                                    dynamic_cast<Bild*>(auswBgB->getThis()));
-                                tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                                tf->setStyle(TextFeld::Style::HBild,
-                                    hatStyle(Style::HBild));
+                                tmpHImage = tf->getHintergrundImage();
+                                tf->setHintergrundImageZ(
+                                    dynamic_cast<Image*>(auswBgB->getThis()));
+                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tf->setStyle(TextField::Style::HImage,
+                                    hatStyle(Style::HImage));
                             }
                             if (hatStyle(Style::AuswahlHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextFeld::Style::HAlpha);
-                                tf->setStyle(TextFeld::Style::HAlpha,
+                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                tf->setStyle(TextField::Style::HAlpha,
                                     hatStyle(Style::AuswahlHAlpha));
                             }
                         }
-                        if (hatStyle(Style::AuswahlRahmen))
+                        if (hatStyle(Style::SelectionBorder))
                         {
-                            tmpRahmen = tf->getRahmen();
-                            tf->setRahmenZ(
-                                dynamic_cast<Rahmen*>(auswRahmen->getThis()));
-                            tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen,
-                                hatStyle(Style::AuswahlRahmen));
+                            tmpBorder = tf->getBorder();
+                            tf->setBorderZ(
+                                dynamic_cast<Border*>(selBorder->getThis()));
+                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tf->setStyle(TextField::Style::Border,
+                                hatStyle(Style::SelectionBorder));
                         }
                     }
                     else
@@ -1255,43 +1255,43 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         {
                             tmpBuffer = tf->getAlphaFeld();
                             tf->setAlphaFeldZ(msAuswAf->get(i));
-                            tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                            tf->setStyle(TextFeld::Style::Buffered,
+                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setStyle(TextField::Style::Buffered,
                                 hatMsStyle(i, Style::AuswahlBuffer));
                         }
                         if (hatMsStyle(i, Style::AuswahlHintergrund))
                         {
                             tmpH = tf->hatStyle(Style::Hintergrund);
-                            tf->setStyle(TextFeld::Style::Hintergrund,
+                            tf->setStyle(TextField::Style::Hintergrund,
                                 hatMsStyle(i, Style::AuswahlHintergrund));
                             if (msAuswBgF && msAuswBgF->hat(i))
                             {
                                 tmpHFarbe = tf->getHintergrundFarbe();
                                 tf->setHintergrundFarbe(msAuswBgF->get(i));
                             }
-                            if (hatMsStyle(i, Style::AuswahlHBild) && msAuswBgB)
+                            if (hatMsStyle(i, Style::AuswahlHImage) && msAuswBgB)
                             {
-                                tmpHBild = tf->getHintergrundBild();
-                                tf->setHintergrundBildZ(msAuswBgB->get(i));
-                                tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                                tf->setStyle(TextFeld::Style::HBild,
-                                    hatMsStyle(i, Style::HBild));
+                                tmpHImage = tf->getHintergrundImage();
+                                tf->setHintergrundImageZ(msAuswBgB->get(i));
+                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tf->setStyle(TextField::Style::HImage,
+                                    hatMsStyle(i, Style::HImage));
                             }
                             if (hatMsStyle(i, Style::AuswahlHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextFeld::Style::HAlpha);
-                                tf->setStyle(TextFeld::Style::HAlpha,
+                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                tf->setStyle(TextField::Style::HAlpha,
                                     hatMsStyle(i, Style::AuswahlHAlpha));
                             }
                         }
-                        if (hatMsStyle(i, Style::AuswahlRahmen) && msAuswRahmen)
+                        if (hatMsStyle(i, Style::SelectionBorder) && msSelBorder)
                         {
-                            tmpRahmen = tf->getRahmen();
-                            tf->setRahmenZ(msAuswRahmen->get(i));
-                            tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen,
-                                hatMsStyle(i, Style::AuswahlRahmen));
+                            tmpBorder = tf->getBorder();
+                            tf->setBorderZ(msSelBorder->get(i));
+                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tf->setStyle(TextField::Style::Border,
+                                hatMsStyle(i, Style::SelectionBorder));
                         }
                     }
                 }
@@ -1304,41 +1304,41 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                             tmpBuffer = tf->getAlphaFeld();
                             tf->setAlphaFeldZ(
                                 dynamic_cast<AlphaFeld*>(mausAf->getThis()));
-                            tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                            tf->setStyle(TextFeld::Style::Buffered,
+                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setStyle(TextField::Style::Buffered,
                                 hatStyle(Style::MausBuffer));
                         }
                         if (hatStyle(Style::MausHintergrund))
                         {
-                            tmpH = tf->hatStyle(TextFeld::Style::Hintergrund);
+                            tmpH = tf->hatStyle(TextField::Style::Hintergrund);
                             tmpHFarbe = tf->getHintergrundFarbe();
                             tf->setHintergrundFarbe(mausBgF);
-                            tf->setStyle(TextFeld::Style::Hintergrund,
+                            tf->setStyle(TextField::Style::Hintergrund,
                                 hatStyle(Style::Hintergrund));
-                            if (hatStyle(Style::MausHBild))
+                            if (hatStyle(Style::MausHImage))
                             {
-                                tmpHBild = tf->getHintergrundBild();
-                                tf->setHintergrundBildZ(
-                                    dynamic_cast<Bild*>(mausBgB->getThis()));
-                                tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                                tf->setStyle(TextFeld::Style::HBild,
-                                    hatStyle(Style::HBild));
+                                tmpHImage = tf->getHintergrundImage();
+                                tf->setHintergrundImageZ(
+                                    dynamic_cast<Image*>(mausBgB->getThis()));
+                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tf->setStyle(TextField::Style::HImage,
+                                    hatStyle(Style::HImage));
                             }
                             if (hatStyle(Style::MausHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextFeld::Style::HAlpha);
-                                tf->setStyle(TextFeld::Style::HAlpha,
+                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                tf->setStyle(TextField::Style::HAlpha,
                                     hatStyle(Style::MausHAlpha));
                             }
                         }
                         if (hatStyle(Style::MausRahmen))
                         {
-                            tmpRahmen = tf->getRahmen();
-                            tf->setRahmenZ(
-                                dynamic_cast<Rahmen*>(mausRahmen->getThis()));
-                            tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen,
+                            tmpBorder = tf->getBorder();
+                            tf->setBorderZ(
+                                dynamic_cast<Border*>(mouseBorder->getThis()));
+                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tf->setStyle(TextField::Style::Border,
                                 hatStyle(Style::MausRahmen));
                         }
                     }
@@ -1348,42 +1348,42 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         {
                             tmpBuffer = tf->getAlphaFeld();
                             tf->setAlphaFeldZ(msMausAf->get(i));
-                            tmpB = tf->hatStyle(TextFeld::Style::Buffered);
-                            tf->setStyle(TextFeld::Style::Buffered,
+                            tmpB = tf->hatStyle(TextField::Style::Buffered);
+                            tf->setStyle(TextField::Style::Buffered,
                                 hatMsStyle(i, Style::MausBuffer));
                         }
                         if (hatMsStyle(i, Style::MausHintergrund))
                         {
                             tmpH = tf->hatStyle(Style::Hintergrund);
-                            tf->setStyle(TextFeld::Style::Hintergrund,
+                            tf->setStyle(TextField::Style::Hintergrund,
                                 hatMsStyle(i, Style::MausHintergrund));
                             if (msMausBgF && msMausBgF->hat(i))
                             {
                                 tmpHFarbe = tf->getHintergrundFarbe();
                                 tf->setHintergrundFarbe(msMausBgF->get(i));
                             }
-                            if (hatMsStyle(i, Style::MausHBild) && msMausBgB)
+                            if (hatMsStyle(i, Style::MausHImage) && msMausBgB)
                             {
-                                tmpHBild = tf->getHintergrundBild();
-                                tf->setHintergrundBildZ(msMausBgB->get(i));
-                                tmpHB = tf->hatStyle(TextFeld::Style::HBild);
-                                tf->setStyle(TextFeld::Style::HBild,
-                                    hatMsStyle(i, Style::HBild));
+                                tmpHImage = tf->getHintergrundImage();
+                                tf->setHintergrundImageZ(msMausBgB->get(i));
+                                tmpHB = tf->hatStyle(TextField::Style::HImage);
+                                tf->setStyle(TextField::Style::HImage,
+                                    hatMsStyle(i, Style::HImage));
                             }
                             if (hatMsStyle(i, Style::MausHAlpha))
                             {
                                 tmpHAlpha
-                                    = tf->hatStyle(TextFeld::Style::HAlpha);
-                                tf->setStyle(TextFeld::Style::HAlpha,
+                                    = tf->hatStyle(TextField::Style::HAlpha);
+                                tf->setStyle(TextField::Style::HAlpha,
                                     hatMsStyle(i, Style::MausHAlpha));
                             }
                         }
-                        if (hatMsStyle(i, Style::MausRahmen) && msMausRahmen)
+                        if (hatMsStyle(i, Style::MausRahmen) && msMouseBorder)
                         {
-                            tmpRahmen = tf->getRahmen();
-                            tf->setRahmenZ(msMausRahmen->get(i));
-                            tmpR = tf->hatStyle(TextFeld::Style::Rahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen,
+                            tmpBorder = tf->getBorder();
+                            tf->setBorderZ(msMouseBorder->get(i));
+                            tmpR = tf->hatStyle(TextField::Style::Border);
+                            tf->setStyle(TextField::Style::Border,
                                 hatMsStyle(i, Style::MausRahmen));
                         }
                     }
@@ -1396,25 +1396,25 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         if (hatStyle(Style::AuswahlBuffer))
                         {
                             tf->setAlphaFeldZ(tmpBuffer);
-                            tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                            tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatStyle(Style::AuswahlHintergrund))
                         {
                             tf->setHintergrundFarbe(tmpHFarbe);
-                            tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
-                            if (hatStyle(Style::AuswahlHBild))
+                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
+                            if (hatStyle(Style::AuswahlHImage))
                             {
-                                tf->setHintergrundBildZ(tmpHBild);
-                                tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
                             if (hatStyle(Style::AuswahlHAlpha))
                                 tf->setStyle(
-                                    TextFeld::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatStyle(Style::AuswahlRahmen))
+                        if (hatStyle(Style::SelectionBorder))
                         {
-                            tf->setRahmenZ(tmpRahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                            tf->setBorderZ(tmpBorder);
+                            tf->setStyle(TextField::Style::Border, tmpR);
                         }
                     }
                     else
@@ -1422,26 +1422,26 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         if (hatMsStyle(i, Style::AuswahlBuffer) && msAuswAf)
                         {
                             tf->setAlphaFeldZ(tmpBuffer);
-                            tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                            tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatMsStyle(i, Style::AuswahlHintergrund))
                         {
-                            tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
+                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
                             if (msAuswBgF && msAuswBgF->hat(i))
                                 tf->setHintergrundFarbe(tmpHFarbe);
-                            if (hatMsStyle(i, Style::AuswahlHBild) && msAuswBgB)
+                            if (hatMsStyle(i, Style::AuswahlHImage) && msAuswBgB)
                             {
-                                tf->setHintergrundBildZ(tmpHBild);
-                                tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
                             if (hatMsStyle(i, Style::AuswahlHAlpha))
                                 tf->setStyle(
-                                    TextFeld::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatMsStyle(i, Style::AuswahlRahmen) && msAuswRahmen)
+                        if (hatMsStyle(i, Style::SelectionBorder) && msSelBorder)
                         {
-                            tf->setRahmenZ(tmpRahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                            tf->setBorderZ(tmpBorder);
+                            tf->setStyle(TextField::Style::Border, tmpR);
                         }
                     }
                 }
@@ -1452,25 +1452,25 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         if (hatStyle(Style::MausBuffer))
                         {
                             tf->setAlphaFeldZ(tmpBuffer);
-                            tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                            tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatStyle(Style::MausHintergrund))
                         {
                             tf->setHintergrundFarbe(tmpHFarbe);
-                            tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
-                            if (hatStyle(Style::MausHBild))
+                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
+                            if (hatStyle(Style::MausHImage))
                             {
-                                tf->setHintergrundBildZ(tmpHBild);
-                                tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
                             if (hatStyle(Style::MausHAlpha))
                                 tf->setStyle(
-                                    TextFeld::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::HAlpha, tmpHAlpha);
                         }
                         if (hatStyle(Style::MausRahmen))
                         {
-                            tf->setRahmenZ(tmpRahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                            tf->setBorderZ(tmpBorder);
+                            tf->setStyle(TextField::Style::Border, tmpR);
                         }
                     }
                     else
@@ -1478,26 +1478,26 @@ void AuswahlBox::render(Bild& zRObj) // renders into zRObj
                         if (hatMsStyle(i, Style::MausBuffer) && msAuswAf)
                         {
                             tf->setAlphaFeldZ(tmpBuffer);
-                            tf->setStyle(TextFeld::Style::Buffered, tmpB);
+                            tf->setStyle(TextField::Style::Buffered, tmpB);
                         }
                         if (hatMsStyle(i, Style::MausHintergrund))
                         {
-                            tf->setStyle(TextFeld::Style::Hintergrund, tmpH);
+                            tf->setStyle(TextField::Style::Hintergrund, tmpH);
                             if (msAuswBgF && msAuswBgF->hat(i))
                                 tf->setHintergrundFarbe(tmpHFarbe);
-                            if (hatMsStyle(i, Style::MausHBild) && msAuswBgB)
+                            if (hatMsStyle(i, Style::MausHImage) && msAuswBgB)
                             {
-                                tf->setHintergrundBildZ(tmpHBild);
-                                tf->setStyle(TextFeld::Style::HBild, tmpHB);
+                                tf->setHintergrundImageZ(tmpHImage);
+                                tf->setStyle(TextField::Style::HImage, tmpHB);
                             }
                             if (hatMsStyle(i, Style::MausHAlpha))
                                 tf->setStyle(
-                                    TextFeld::Style::HAlpha, tmpHAlpha);
+                                    TextField::Style::HAlpha, tmpHAlpha);
                         }
-                        if (hatMsStyle(i, Style::MausRahmen) && msAuswRahmen)
+                        if (hatMsStyle(i, Style::MausRahmen) && msSelBorder)
                         {
-                            tf->setRahmenZ(tmpRahmen);
-                            tf->setStyle(TextFeld::Style::Rahmen, tmpR);
+                            tf->setBorderZ(tmpBorder);
+                            tf->setStyle(TextField::Style::Border, tmpR);
                         }
                     }
                 }
@@ -1548,13 +1548,13 @@ Text* AuswahlBox::zEintragText(int i) const
     return members->z(i) ? members->z(i)->zText() : 0;
 }
 
-TextFeld* AuswahlBox::getEintrag(int i) const // returns the entry
+TextField* AuswahlBox::getEintrag(int i) const // returns the entry
 {
     if (i >= anzahl) return 0;
     return members->get(i);
 }
 
-TextFeld* AuswahlBox::zEintrag(int i) const
+TextField* AuswahlBox::zEintrag(int i) const
 {
     if (i >= anzahl) return 0;
     return members->z(i);
@@ -1599,18 +1599,18 @@ Knopf* AuswahlBox::zAusklappKnopf() const
     return ausfahren;
 }
 
-Rahmen* AuswahlBox::getEintragRahmen(int i) const // returns the entry border
+Border* AuswahlBox::getEntryBorder(int i) const // returns the entry border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getRahmen();
+    return members->z(i)->getBorder();
 }
 
-Rahmen* AuswahlBox::zEintragRahmen(int i) const
+Border* AuswahlBox::zEntryBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->zRahmen();
+    return members->z(i)->zBorder();
 }
 
 int AuswahlBox::getEintragRahmenFarbe(
@@ -1618,7 +1618,7 @@ int AuswahlBox::getEintragRahmenFarbe(
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getRahmenFarbe();
+    return members->z(i)->getBorderColor();
 }
 
 int AuswahlBox::getEintragRahmenBreite(
@@ -1626,7 +1626,7 @@ int AuswahlBox::getEintragRahmenBreite(
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getRahmenBreite();
+    return members->z(i)->getBorderWidth();
 }
 
 AlphaFeld* AuswahlBox::getEintragAlphaFeld(
@@ -1668,44 +1668,44 @@ int AuswahlBox::getEintragHintergrundFarbe(
     return members->z(i)->getHintergrundFarbe();
 }
 
-Bild* AuswahlBox::getEintragHintergrundBild(
+Image* AuswahlBox::getEintragHintergrundImage(
     int i) const // returns the entry background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->getHintergrundBild();
+    return members->z(i)->getHintergrundImage();
 }
 
-Bild* AuswahlBox::zEintragHintergrundBild(int i) const
+Image* AuswahlBox::zEintragHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!members->z(i)) return 0;
-    return members->z(i)->zHintergrundBild();
+    return members->z(i)->zHintergrundImage();
 }
 
-Rahmen* AuswahlBox::getAuswRahmen() const // returns the selection border
+Border* AuswahlBox::getSelBorder() const // returns the selection border
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswRahmen ? dynamic_cast<Rahmen*>(auswRahmen->getThis()) : 0;
+    return selBorder ? dynamic_cast<Border*>(selBorder->getThis()) : 0;
 }
 
-Rahmen* AuswahlBox::zAuswRahmen() const
+Border* AuswahlBox::zSelBorder() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswRahmen;
+    return selBorder;
 }
 
 int AuswahlBox::getAuswRahmenFarbe() const // returns the selection border color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswRahmen ? auswRahmen->getFarbe() : 0;
+    return selBorder ? selBorder->getFarbe() : 0;
 }
 
 int AuswahlBox::getAuswRahmenBreite()
     const // returns the selection border width
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswRahmen ? auswRahmen->getRBreite() : 0;
+    return selBorder ? selBorder->getRBreite() : 0;
 }
 
 AlphaFeld*
@@ -1742,50 +1742,50 @@ int AuswahlBox::getAuswHintergrundFarbe()
     return auswBgF;
 }
 
-Bild* AuswahlBox::getAuswHintergrundBild()
+Image* AuswahlBox::getAuswHintergrundImage()
     const // returns the selection background image
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return auswBgB ? dynamic_cast<Bild*>(auswBgB->getThis()) : 0;
+    return auswBgB ? dynamic_cast<Image*>(auswBgB->getThis()) : 0;
 }
 
-Bild* AuswahlBox::zAuswHintergrundBild() const
+Image* AuswahlBox::zAuswHintergrundImage() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return auswBgB;
 }
 
-Rahmen* AuswahlBox::getMsAuswRahmen(
+Border* AuswahlBox::getMsSelBorder(
     int i) const // returns the multistyle selection border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswRahmen) return 0;
-    return msAuswRahmen->z(i)
-             ? dynamic_cast<Rahmen*>(msAuswRahmen->z(i)->getThis())
+    if (!msSelBorder) return 0;
+    return msSelBorder->z(i)
+             ? dynamic_cast<Border*>(msSelBorder->z(i)->getThis())
              : 0;
 }
 
-Rahmen* AuswahlBox::zMsAuswRahmen(int i) const
+Border* AuswahlBox::zMsSelBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswRahmen) return 0;
-    return msAuswRahmen->z(i);
+    if (!msSelBorder) return 0;
+    return msSelBorder->z(i);
 }
 
 int AuswahlBox::getMsAuswRahmenFarbe(
     int i) const // returns the multistyle selection border color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswRahmen) return 0;
-    return msAuswRahmen->z(i) ? msAuswRahmen->z(i)->getFarbe() : 0;
+    if (!msSelBorder) return 0;
+    return msSelBorder->z(i) ? msSelBorder->z(i)->getFarbe() : 0;
 }
 
 int AuswahlBox::getMsAuswRahmenBreite(
     int i) const // returns the multistyle selection border width
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msAuswRahmen) return 0;
-    return msAuswRahmen->z(i) ? msAuswRahmen->z(i)->getRBreite() : 0;
+    if (!msSelBorder) return 0;
+    return msSelBorder->z(i) ? msSelBorder->z(i)->getRBreite() : 0;
 }
 
 AlphaFeld* AuswahlBox::getMsAuswAlphaFeld(
@@ -1828,7 +1828,7 @@ int AuswahlBox::getMsAuswHintergrundFarbe(
     return msAuswBgF->get(i);
 }
 
-Bild* AuswahlBox::getMsAuswHintergrundBild(
+Image* AuswahlBox::getMsAuswHintergrundImage(
     int i) const // returns the multistyle selection background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1836,35 +1836,35 @@ Bild* AuswahlBox::getMsAuswHintergrundBild(
     return msAuswBgB->get(i);
 }
 
-Bild* AuswahlBox::zMsAuswHintergrundBild(int i) const
+Image* AuswahlBox::zMsAuswHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msAuswBgB) return 0;
     return msAuswBgB->z(i);
 }
 
-Rahmen* AuswahlBox::getMausRahmen() const // returns the mouse border
+Border* AuswahlBox::getMouseBorder() const // returns the mouse border
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausRahmen ? dynamic_cast<Rahmen*>(mausRahmen->getThis()) : 0;
+    return mouseBorder ? dynamic_cast<Border*>(mouseBorder->getThis()) : 0;
 }
 
-Rahmen* AuswahlBox::zMausRahmen() const
+Border* AuswahlBox::zMouseBorder() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausRahmen;
+    return mouseBorder;
 }
 
 int AuswahlBox::getMausRahmenFarbe() const // returns the mouse border color
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausRahmen ? mausRahmen->getFarbe() : 0;
+    return mouseBorder ? mouseBorder->getFarbe() : 0;
 }
 
 int AuswahlBox::getMausRahmenBreite() const // returns the mouse border width
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausRahmen ? mausRahmen->getRBreite() : 0;
+    return mouseBorder ? mouseBorder->getRBreite() : 0;
 }
 
 AlphaFeld* AuswahlBox::getMausAlphaFeld() const // returns the mouse AlphaFeld
@@ -1900,48 +1900,48 @@ int AuswahlBox::getMausHintergrundFarbe()
     return mausBgF;
 }
 
-Bild* AuswahlBox::getMausHintergrundBild()
+Image* AuswahlBox::getMausHintergrundImage()
     const // returns the mouse background image
 {
     if (hatStyle(Style::MultiStyled)) return 0;
-    return mausBgB ? dynamic_cast<Bild*>(mausBgB->getThis()) : 0;
+    return mausBgB ? dynamic_cast<Image*>(mausBgB->getThis()) : 0;
 }
 
-Bild* AuswahlBox::zMausHintergrundBild() const
+Image* AuswahlBox::zMausHintergrundImage() const
 {
     if (hatStyle(Style::MultiStyled)) return 0;
     return mausBgB;
 }
 
-Rahmen* AuswahlBox::getMsMausRahmen(
+Border* AuswahlBox::getMsMouseBorder(
     int i) const // returns the multistyle mouse border
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausRahmen) return 0;
-    return msMausRahmen->get(i);
+    if (!msMouseBorder) return 0;
+    return msMouseBorder->get(i);
 }
 
-Rahmen* AuswahlBox::zMsMausRahmen(int i) const
+Border* AuswahlBox::zMsMouseBorder(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausRahmen) return 0;
-    return msMausRahmen->z(i);
+    if (!msMouseBorder) return 0;
+    return msMouseBorder->z(i);
 }
 
 int AuswahlBox::getMsMausRahmenFarbe(
     int i) const // returns the multistyle mouse border color
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausRahmen) return 0;
-    return msMausRahmen->z(i) ? msMausRahmen->z(i)->getFarbe() : 0;
+    if (!msMouseBorder) return 0;
+    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getFarbe() : 0;
 }
 
 int AuswahlBox::getMsMausRahmenBreite(
     int i) const // returns the multistyle mouse border width
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
-    if (!msMausRahmen) return 0;
-    return msMausRahmen->z(i) ? msMausRahmen->z(i)->getRBreite() : 0;
+    if (!msMouseBorder) return 0;
+    return msMouseBorder->z(i) ? msMouseBorder->z(i)->getRBreite() : 0;
 }
 
 AlphaFeld* AuswahlBox::getMsMausAlphaFeld(
@@ -1983,7 +1983,7 @@ int AuswahlBox::getMsMausHintergrundFarbe(
     return msMausBgF->get(i);
 }
 
-Bild* AuswahlBox::getMsMausHintergrundBild(
+Image* AuswahlBox::getMsMausHintergrundImage(
     int i) const // returns the multistyle mouse background image
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
@@ -1991,7 +1991,7 @@ Bild* AuswahlBox::getMsMausHintergrundBild(
     return msMausBgB->get(i);
 }
 
-Bild* AuswahlBox::zMsMausHintergrundBild(int i) const
+Image* AuswahlBox::zMsMausHintergrundImage(int i) const
 {
     if (!hatStyle(Style::MultiStyled)) return 0;
     if (!msMausBgB) return 0;
@@ -2037,23 +2037,23 @@ Drawable* AuswahlBox::dublizieren() const // Creates a copy of the drawing
     obj->setStyle(style);
     if (textRd)
         obj->setTextRendererZ(dynamic_cast<TextRenderer*>(textRd->getThis()));
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     if (ausfahren) obj->setAusklappKnopfZ((Knopf*)ausfahren->dublizieren());
     obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
-    if (auswRahmen) obj->setAuswRahmenZ((Rahmen*)auswRahmen->dublizieren());
+    if (selBorder) obj->setSelBorderZ((Border*)selBorder->dublizieren());
     obj->setAuswHintergrundFarbe(auswBgF);
     if (auswBgB)
-        obj->setAuswHintergrundBild(dynamic_cast<Bild*>(auswBgB->getThis()));
+        obj->setAuswHintergrundImage(dynamic_cast<Image*>(auswBgB->getThis()));
     if (auswAf) obj->setAuswAlphaFeldZ((AlphaFeld*)auswAf->dublizieren());
-    if (mausRahmen) obj->setMausRahmenZ((Rahmen*)mausRahmen->dublizieren());
+    if (mouseBorder) obj->setMouseBorderZ((Border*)mouseBorder->dublizieren());
     obj->setMausHintergrundFarbe(mausBgF);
     if (mausBgB)
-        obj->setMausHintergrundBild(dynamic_cast<Bild*>(mausBgB->getThis()));
+        obj->setMausHintergrundImage(dynamic_cast<Image*>(mausBgB->getThis()));
     if (mausAf) obj->setMausAlphaFeldZ((AlphaFeld*)mausAf->dublizieren());
     obj->setMaxAuskappHeight(ausklapMaxHeight);
     obj->setEintragHeight(eintragHeight);
@@ -2062,25 +2062,25 @@ Drawable* AuswahlBox::dublizieren() const // Creates a copy of the drawing
         if (members->z(i))
         {
             obj->addEintrag("a");
-            obj->setEintragZ(i, (TextFeld*)members->z(i)->dublizieren());
+            obj->setEintragZ(i, (TextField*)members->z(i)->dublizieren());
             if (msStyle && msStyle->hat(i)) obj->setMsStyle(i, msStyle->get(i));
-            if (msAuswRahmen && msAuswRahmen->z(i))
-                obj->setMsAuswRahmenZ(
-                    i, (Rahmen*)msAuswRahmen->z(i)->dublizieren());
+            if (msSelBorder && msSelBorder->z(i))
+                obj->setMsSelBorderZ(
+                    i, (Border*)msSelBorder->z(i)->dublizieren());
             if (msAuswBgF && msAuswBgF->hat(i))
                 obj->setMsAuswHintergrundFarbe(i, msAuswBgF->get(i));
             if (msAuswBgB && msAuswBgB->z(i))
-                obj->setMsAuswHintergrundBild(i, msAuswBgB->get(i));
+                obj->setMsAuswHintergrundImage(i, msAuswBgB->get(i));
             if (msAuswAf && msAuswAf->z(i))
                 obj->setMsAuswAlphaFeldZ(
                     i, (AlphaFeld*)msAuswAf->z(i)->dublizieren());
-            if (msMausRahmen && msMausRahmen->z(i))
-                obj->setMsMausRahmenZ(
-                    i, (Rahmen*)msMausRahmen->z(i)->dublizieren());
+            if (msMouseBorder && msMouseBorder->z(i))
+                obj->setMsMouseBorderZ(
+                    i, (Border*)msMouseBorder->z(i)->dublizieren());
             if (msMausBgF && msMausBgF->hat(i))
                 obj->setMsMausHintergrundFarbe(i, msMausBgF->get(i));
             if (msMausBgB && msMausBgB->z(i))
-                obj->setMsMausHintergrundBild(i, msMausBgB->get(i));
+                obj->setMsMausHintergrundImage(i, msMausBgB->get(i));
             if (msMausAf && msMausAf->z(i))
                 obj->setMsMausAlphaFeldZ(
                     i, (AlphaFeld*)msMausAf->z(i)->dublizieren());

SelectionBox.h

@@ -6,13 +6,13 @@
 
 namespace Framework
 {
-    class TextFeld;   //! TextField.h
+    class TextField;   //! TextField.h
     class VScrollBar; //! Scroll.h
-    class Rahmen;     //! Border.h
+    class Border;     //! Border.h
     class Knopf;      //! Button.h
     class AlphaFeld;  //! AlphaField.h
     class Text;       //! Tet.h
-    class Schrift;    //! Font.h
+    class Font;    //! Font.h
     class TextRenderer;
 
     //! A 2D GUI Framework drawing. Represents a box from which
@@ -24,12 +24,12 @@ namespace Framework
         {
         public:
             //! If this flag is set, each value in the list has a border
-            static const __int64 FeldRahmen = 0x000001000;
+            static const __int64 FieldBorder = 0x000001000;
             //! If this flag is set, each value in the list has a background
             static const __int64 FeldHintergrund = 0x000002000;
             //! If this flag is set, each value in the list has an image
             //! as background
-            static const __int64 FeldHBild = 0x000004000;
+            static const __int64 FeldHImage = 0x000004000;
             //! If this flag is set, each value in the list has a
             //! transparent background
             static const __int64 FeldHAlpha = 0x000008000;
@@ -41,7 +41,7 @@ namespace Framework
             static const __int64 AuswahlHintergrund = 0x000020000;
             //! If this flag is set, the currently selected value
             //! gets a background image
-            static const __int64 AuswahlHBild = 0x000040000;
+            static const __int64 AuswahlHImage = 0x000040000;
             //! If this flag is set, the currently selected value
             //! gets a transparent background
             static const __int64 AuswahlHAlpha = 0x000080000;
@@ -50,7 +50,7 @@ namespace Framework
             static const __int64 AuswahlBuffer = 0x000100000;
             //! If this flag is set, the currently selected value
             //! gets a border
-            static const __int64 AuswahlRahmen = 0x000200000;
+            static const __int64 SelectionBorder = 0x000200000;
             //! If this flag is set, each value has its own backgrounds
             //! and borders instead of sharing the same ones
             static const __int64 MultiStyled = 0x000400000;
@@ -63,7 +63,7 @@ namespace Framework
             static const __int64 MausHintergrund = 0x008000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a background image
-            static const __int64 MausHBild = 0x010000000;
+            static const __int64 MausHImage = 0x010000000;
             //! If this flag is set, the element the mouse is pointing
             //! at has a transparent background
             static const __int64 MausHAlpha = 0x020000000;
@@ -80,31 +80,31 @@ namespace Framework
             //! SelectionBuffer, SelectionBorder, MaxHeight, VScroll,
             //! MouseBorder, MouseBuffer
             static const __int64 Normal
-                = Sichtbar | Erlaubt | Rahmen | FeldRahmen | AuswahlBuffer
-                | AuswahlRahmen | MaxHeight | VScroll | MausRahmen | MausBuffer
+                = Sichtbar | Erlaubt | Border | FieldBorder | AuswahlBuffer
+                | SelectionBorder | MaxHeight | VScroll | MausRahmen | MausBuffer
                 | Hintergrund | MEIgnoreParentInside | MEIgnoreVerarbeitet;
         };
 
     private:
         TextRenderer* textRd;
         Array<__int64>* msStyle;
-        RCArray<TextFeld>* members;
+        RCArray<TextField>* members;
         Knopf* ausfahren;
-        Rahmen* auswRahmen;
+        Border* selBorder;
         int auswBgF;
-        Bild* auswBgB;
+        Image* auswBgB;
         AlphaFeld* auswAf;
-        RCArray<Rahmen>* msAuswRahmen;
+        RCArray<Border>* msSelBorder;
         Array<int>* msAuswBgF;
-        RCArray<Bild>* msAuswBgB;
+        RCArray<Image>* msAuswBgB;
         RCArray<AlphaFeld>* msAuswAf;
-        Rahmen* mausRahmen;
+        Border* mouseBorder;
         int mausBgF;
-        Bild* mausBgB;
+        Image* mausBgB;
         AlphaFeld* mausAf;
-        RCArray<Rahmen>* msMausRahmen;
+        RCArray<Border>* msMouseBorder;
         Array<int>* msMausBgF;
-        RCArray<Bild>* msMausBgB;
+        RCArray<Image>* msMausBgB;
         RCArray<AlphaFeld>* msMausAf;
         int anzahl;
         int auswahl;
@@ -139,7 +139,7 @@ namespace Framework
         DLLEXPORT void setTextRendererZ(TextRenderer* textRd);
         //! Sets the used font
         //! \param schrift The font
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Adds a selectable entry to the list. The first entry is
         //! automatically selected at the beginning \param txt The text of
         //! the entry
@@ -151,7 +151,7 @@ namespace Framework
         //! Adds a selectable entry to the list. The first entry is
         //! automatically selected at the beginning \param txt A pointer to
         //! the entry
-        DLLEXPORT void addEintragZ(TextFeld* txt);
+        DLLEXPORT void addEintragZ(TextField* txt);
         //! Changes the text of an entry
         //! \param i The index of the entry
         //! \param txt The new text
@@ -163,7 +163,7 @@ namespace Framework
         //! Changes an entry
         //! \param i The index of the entry
         //! \param txt A pointer to the new entry
-        DLLEXPORT void setEintragZ(int i, TextFeld* txt);
+        DLLEXPORT void setEintragZ(int i, TextField* txt);
         //! Deletes an entry
         //! \param i The index of the entry
         DLLEXPORT void removeEintrag(int i);
@@ -172,7 +172,7 @@ namespace Framework
         DLLEXPORT void setAusklappKnopfZ(Knopf* ausK);
         //! Sets a pointer to a border used for a specific entry
         //! \param i The index of the entry \param rahmen The border
-        DLLEXPORT void setEintragRahmenZ(int i, Rahmen* rahmen);
+        DLLEXPORT void setEntryBorderZ(int i, Border* rahmen);
         //! Sets the color of a border used for a specific entry
         //! \param i The index of the entry \param f The color in
         //! A8R8G8B8 format
@@ -188,11 +188,11 @@ namespace Framework
         //! Sets a pointer to a background image used for a specific
         //! entry \param i The index of the entry
         //! \param bgB The background image
-        DLLEXPORT void setEintragHintergrundBildZ(int i, Bild* bgB);
+        DLLEXPORT void setEintragHintergrundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used for a specific
         //! entry \param i The index of the entry \param bgB The
         //! background image
-        DLLEXPORT void setEintragHintergrundBild(int i, Bild* bgB);
+        DLLEXPORT void setEintragHintergrundImage(int i, Image* bgB);
         //! Sets a pointer to a color gradient used for a specific
         //! entry \param i The index of the entry \param af The
         //! color gradient
@@ -207,7 +207,7 @@ namespace Framework
         DLLEXPORT void setEintragAlphaFeldStrength(int i, int afSt);
         //! Sets a pointer to a border used for the selected entry
         //! \param rahmen The border
-        DLLEXPORT void setAuswRahmenZ(Rahmen* rahmen);
+        DLLEXPORT void setSelBorderZ(Border* rahmen);
         //! Sets the color of a border used for the selected entry
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setAuswRahmenFarbe(int f);
@@ -219,10 +219,10 @@ namespace Framework
         DLLEXPORT void setAuswHintergrundFarbe(int f);
         //! Sets a pointer to a background image used for the selected
         //! entry \param bgB The image
-        DLLEXPORT void setAuswHintergrundBildZ(Bild* bgB);
+        DLLEXPORT void setAuswHintergrundImageZ(Image* bgB);
         //! Sets a background image by copying, used for the selected
         //! entry \param bgB The image
-        DLLEXPORT void setAuswHintergrundBild(Bild* bgB);
+        DLLEXPORT void setAuswHintergrundImage(Image* bgB);
         //! Sets a pointer to a color gradient used for the selected
         //! entry \param af The color gradient
         DLLEXPORT void setAuswAlphaFeldZ(AlphaFeld* af);
@@ -235,7 +235,7 @@ namespace Framework
         //! Sets a pointer to a border used with the MultiStyled flag
         //! when selecting a specific entry \param i
         //! The index of the entry \param rahmen The border
-        DLLEXPORT void setMsAuswRahmenZ(int i, Rahmen* rahmen);
+        DLLEXPORT void setMsSelBorderZ(int i, Border* rahmen);
         //! Sets the color of a border used with the MultiStyled flag when
         //! selecting a specific entry \param i The index
         //! of the entry \param f The color in A8R8G8B8 format
@@ -252,12 +252,12 @@ namespace Framework
         //! flag when selecting a specific entry
         //! \param i The index of the entry
         //! \param bgB The image
-        DLLEXPORT void setMsAuswHintergrundBildZ(int i, Bild* bgB);
+        DLLEXPORT void setMsAuswHintergrundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
         //! \param bgB The image
-        DLLEXPORT void setMsAuswHintergrundBild(int i, Bild* bgB);
+        DLLEXPORT void setMsAuswHintergrundImage(int i, Image* bgB);
         //! Sets a pointer to a color gradient used with the MultiStyled
         //! flag when selecting a specific entry
         //! \param i The index of the entry
@@ -273,7 +273,7 @@ namespace Framework
         DLLEXPORT void setMsAuswAlphaFeldStrength(int i, int afSt);
         //! Sets a pointer to a border used for the entry the mouse is
         //! pointing at \param rahmen The border
-        DLLEXPORT void setMausRahmenZ(Rahmen* rahmen);
+        DLLEXPORT void setMouseBorderZ(Border* rahmen);
         //! Sets the color of a border used for the entry the mouse is
         //! pointing at \param f The color in A8R8G8B8 format
         DLLEXPORT void setMausRahmenFarbe(int f);
@@ -285,10 +285,10 @@ namespace Framework
         DLLEXPORT void setMausHintergrundFarbe(int f);
         //! Sets a pointer to a background image used for the entry the mouse
         //! is pointing at \param bgB The image
-        DLLEXPORT void setMausHintergrundBildZ(Bild* bgB);
+        DLLEXPORT void setMausHintergrundImageZ(Image* bgB);
         //! Sets a background image by copying, used for the entry the mouse
         //! is pointing at \param bgB The image
-        DLLEXPORT void setMausHintergrundBild(Bild* bgB);
+        DLLEXPORT void setMausHintergrundImage(Image* bgB);
         //! Sets a color gradient used for the entry the mouse is pointing
         //! at \param af The color gradient
         DLLEXPORT void setMausAlphaFeldZ(AlphaFeld* af);
@@ -302,7 +302,7 @@ namespace Framework
         //! specific entry the mouse is pointing at
         //! \param i The index of the entry
         //! \param rahmen The border
-        DLLEXPORT void setMsMausRahmenZ(int i, Rahmen* rahmen);
+        DLLEXPORT void setMsMouseBorderZ(int i, Border* rahmen);
         //! Sets the color of a border used with the MultiStyled flag for a
         //! specific entry the mouse is pointing at \param i
         //! The index of the entry \param f The color in A8R8G8B8 format
@@ -319,11 +319,11 @@ namespace Framework
         //! Sets a pointer to a background image used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param bgB The image
-        DLLEXPORT void setMsMausHintergrundBildZ(int i, Bild* bgB);
+        DLLEXPORT void setMsMausHintergrundImageZ(int i, Image* bgB);
         //! Sets a background image by copying, used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param bgB The image
-        DLLEXPORT void setMsMausHintergrundBild(int i, Bild* bgB);
+        DLLEXPORT void setMsMausHintergrundImage(int i, Image* bgB);
         //! Sets a pointer to a color gradient used with the MultiStyled
         //! flag for a specific entry the mouse is pointing at
         //! \param i The index of the entry \param af The color gradient
@@ -381,7 +381,7 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the index of an entry
         //! \param txt The text of the entry
         DLLEXPORT int getEintragPos(const char* txt) const;
@@ -396,10 +396,10 @@ namespace Framework
         DLLEXPORT Text* zEintragText(int i) const;
         //! Returns an entry
         //! \param i The index of the entry
-        DLLEXPORT TextFeld* getEintrag(int i) const;
+        DLLEXPORT TextField* getEintrag(int i) const;
         //! Returns an entry without increased reference counter
         //! \param i The index of the entry
-        DLLEXPORT TextFeld* zEintrag(int i) const;
+        DLLEXPORT TextField* zEintrag(int i) const;
         //! Returns the index of the selected entry
         DLLEXPORT int getAuswahl() const;
         //! Returns the number of entries
@@ -417,10 +417,10 @@ namespace Framework
         DLLEXPORT Knopf* zAusklappKnopf() const;
         //! Returns the border of an entry
         //! \param i The index of the entry
-        DLLEXPORT Rahmen* getEintragRahmen(int i) const;
+        DLLEXPORT Border* getEntryBorder(int i) const;
         //! Returns the border of an entry without increased reference counter
         //! \param i The index of the entry
-        DLLEXPORT Rahmen* zEintragRahmen(int i) const;
+        DLLEXPORT Border* zEntryBorder(int i) const;
         //! Returns the color of a border of an entry in A8R8G8B8 format
         //! \param i The index of the entry
         DLLEXPORT int getEintragRahmenFarbe(int i) const;
@@ -444,15 +444,15 @@ namespace Framework
         DLLEXPORT int getEintragHintergrundFarbe(int i) const;
         //! Returns the background image of an entry
         //! \param i The index of the entry
-        DLLEXPORT Bild* getEintragHintergrundBild(int i) const;
+        DLLEXPORT Image* getEintragHintergrundImage(int i) const;
         //! Returns the background image of an entry without increased reference
         //! counter \param i The index of the entry
-        DLLEXPORT Bild* zEintragHintergrundBild(int i) const;
+        DLLEXPORT Image* zEintragHintergrundImage(int i) const;
         //! Returns the border used when selecting an entry
-        DLLEXPORT Rahmen* getAuswRahmen() const;
+        DLLEXPORT Border* getSelBorder() const;
         //! Returns the border without increased reference counter used when
         //! selecting an entry
-        DLLEXPORT Rahmen* zAuswRahmen() const;
+        DLLEXPORT Border* zSelBorder() const;
         //! Returns the color of the border in A8R8G8B8 format used when
         //! selecting an entry
         DLLEXPORT int getAuswRahmenFarbe() const;
@@ -473,17 +473,17 @@ namespace Framework
         //! selecting an entry
         DLLEXPORT int getAuswHintergrundFarbe() const;
         //! Returns the background image used when selecting an entry
-        DLLEXPORT Bild* getAuswHintergrundBild() const;
+        DLLEXPORT Image* getAuswHintergrundImage() const;
         //! Returns the background image without increased reference counter used
         //! when selecting an entry
-        DLLEXPORT Bild* zAuswHintergrundBild() const;
+        DLLEXPORT Image* zAuswHintergrundImage() const;
         //! Returns the border used with the MultiStyled flag when selecting
         //! a specific entry \param i The index of the entry
-        DLLEXPORT Rahmen* getMsAuswRahmen(int i) const;
+        DLLEXPORT Border* getMsSelBorder(int i) const;
         //! Returns the border without increased reference counter used with the
         //! MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Rahmen* zMsAuswRahmen(int i) const;
+        DLLEXPORT Border* zMsSelBorder(int i) const;
         //! Returns the color of the border in A8R8G8B8 format used with the
         //! MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
@@ -512,16 +512,16 @@ namespace Framework
         DLLEXPORT int getMsAuswHintergrundFarbe(int i) const;
         //! Returns the background image used with the MultiStyled flag when
         //! selecting a specific entry \param i The index of the entry
-        DLLEXPORT Bild* getMsAuswHintergrundBild(int i) const;
+        DLLEXPORT Image* getMsAuswHintergrundImage(int i) const;
         //! Returns the background image without increased reference counter used
         //! with the MultiStyled flag when selecting a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Bild* zMsAuswHintergrundBild(int i) const;
+        DLLEXPORT Image* zMsAuswHintergrundImage(int i) const;
         //! Returns the border used when the mouse is pointing at an entry
-        DLLEXPORT Rahmen* getMausRahmen() const;
+        DLLEXPORT Border* getMouseBorder() const;
         //! Returns the border without increased reference counter used when
         //! the mouse is pointing at an entry
-        DLLEXPORT Rahmen* zMausRahmen() const;
+        DLLEXPORT Border* zMouseBorder() const;
         //! Returns the color of the border in A8R8G8B8 format used when
         //! the mouse is pointing at an entry
         DLLEXPORT int getMausRahmenFarbe() const;
@@ -545,17 +545,17 @@ namespace Framework
         DLLEXPORT int getMausHintergrundFarbe() const;
         //! Returns the background image used when the mouse is pointing
         //! at an entry
-        DLLEXPORT Bild* getMausHintergrundBild() const;
+        DLLEXPORT Image* getMausHintergrundImage() const;
         //! Returns the background image without increased reference counter used
         //! when the mouse is pointing at an entry
-        DLLEXPORT Bild* zMausHintergrundBild() const;
+        DLLEXPORT Image* zMausHintergrundImage() const;
         //! Returns the border used with the Multistyle flag when the mouse
         //! is pointing at a specific entry \param i The index of the entry
-        DLLEXPORT Rahmen* getMsMausRahmen(int i) const;
+        DLLEXPORT Border* getMsMouseBorder(int i) const;
         //! Returns the border without increased reference counter used with the
         //! Multistyle flag when the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Rahmen* zMsMausRahmen(int i) const;
+        DLLEXPORT Border* zMsMouseBorder(int i) const;
         //! Returns the color of the border in A8R8G8B8 format used with the
         //! Multistyle flag when the mouse is pointing at a specific entry
         //! \param i The index of the entry
@@ -587,11 +587,11 @@ namespace Framework
         //! Returns the background image used with the Multistyle flag when
         //! the mouse is pointing at a specific entry
         //! \param i The index of the entry
-        DLLEXPORT Bild* getMsMausHintergrundBild(int i) const;
+        DLLEXPORT Image* getMsMausHintergrundImage(int i) const;
         //! Returns the background image without increased reference counter used
         //! with the Multistyle flag when the mouse is pointing at a specific
         //! entry \param i The index of the entry
-        DLLEXPORT Bild* zMsMausHintergrundBild(int i) const;
+        DLLEXPORT Image* zMsMausHintergrundImage(int i) const;
         //! Checks whether a point is inside this object
         //! \param x The x coordinate of the point
         //! \param y The y coordinate of the point

Slider.cpp

@@ -42,7 +42,7 @@ void Slider::doMausEreignis(MausEreignis& me, bool userRet)
 
 // renders the drawing into a specific image
 //  zRObj: The image to be drawn into
-void Slider::render(Bild& zRObj)
+void Slider::render(Image& zRObj)
 {
     if (hatStyle(Style::Sichtbar))
     {

Slider.h

@@ -19,6 +19,6 @@ namespace Framework
         DLLEXPORT void doMausEreignis(MausEreignis& me, bool userRet) override;
         //! Draws the drawing into a specific image
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
     };
 } // namespace Framework

Table.cpp

@@ -37,7 +37,7 @@ ObjTabelle::ObjTabelle()
       rasterBreite(1),
       aRam(0),
       aAf(0),
-      msaRam(new RCArray<RCArray<Rahmen>>()),
+      msaRam(new RCArray<RCArray<Border>>()),
       msaAf(new RCArray<RCArray<AlphaFeld>>()),
       styles(new RCArray<Array<__int64>>())
 {
@@ -80,7 +80,7 @@ void ObjTabelle::doMausEreignis(
         bool insideParent = me.insideParent;
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         me.mx -= rbr;
         me.my -= rbr;
         if (hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -291,7 +291,7 @@ void ObjTabelle::addSpalte(int sNum, const char* name) // insert column at sNum
     spaltenBreite->add(100, sNum);
     minSpaltenBreite->add(0, sNum);
     maxSpaltenBreite->add(300, sNum);
-    msaRam->add(new RCArray<Rahmen>(), sNum);
+    msaRam->add(new RCArray<Border>(), sNum);
     msaAf->add(new RCArray<AlphaFeld>(), sNum);
     styles->add(new Array<__int64>(), sNum);
     for (int i = 0; i < zeilenAnzahl; i++)
@@ -700,7 +700,7 @@ void ObjTabelle::setRasterBreite(int br) // sets the width of the grid
     rend = 1;
 }
 
-void ObjTabelle::setARahmenZ(Rahmen* ram) // sets the selection border
+void ObjTabelle::setABorderZ(Border* ram) // sets the selection border
 {
     if (aRam) aRam->release();
     aRam = ram;
@@ -709,14 +709,14 @@ void ObjTabelle::setARahmenZ(Rahmen* ram) // sets the selection border
 
 void ObjTabelle::setARFarbe(int f) // sets the selection border color
 {
-    if (!aRam) aRam = new LRahmen();
+    if (!aRam) aRam = new LBorder();
     aRam->setFarbe(f);
     rend = 1;
 }
 
 void ObjTabelle::setARBreite(int br) // sets the selection border width
 {
-    if (!aRam) aRam = new LRahmen();
+    if (!aRam) aRam = new LBorder();
     aRam->setRamenBreite(br);
     rend = 1;
 }
@@ -743,23 +743,23 @@ void ObjTabelle::setAAfStrength(
     rend = 1;
 }
 
-void ObjTabelle::setARahmenZ(
-    int sNum, int zNum, Rahmen* ram) // sets the selection border
+void ObjTabelle::setABorderZ(
+    int sNum, int zNum, Border* ram) // sets the selection border
 {
     if (msaRam->z(sNum)) msaRam->z(sNum)->set(ram, zNum);
     rend = 1;
 }
 
-void ObjTabelle::setARahmenZ(
-    const char* spaltenName, const char* zeilenName, Rahmen* ram)
+void ObjTabelle::setABorderZ(
+    const char* spaltenName, const char* zeilenName, Border* ram)
 {
-    setARahmenZ(
+    setABorderZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
 }
 
-void ObjTabelle::setARahmenZ(Text* spaltenName, Text* zeilenName, Rahmen* ram)
+void ObjTabelle::setABorderZ(Text* spaltenName, Text* zeilenName, Border* ram)
 {
-    setARahmenZ(
+    setABorderZ(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName), ram);
 }
 
@@ -768,10 +768,10 @@ void ObjTabelle::setARFarbe(
 {
     if (msaRam->z(sNum))
     {
-        Rahmen* tmp = msaRam->z(sNum)->z(zNum);
+        Border* tmp = msaRam->z(sNum)->z(zNum);
         if (!tmp)
         {
-            tmp = new LRahmen();
+            tmp = new LBorder();
             msaRam->z(sNum)->set(tmp, zNum);
         }
         tmp->setFarbe(f);
@@ -795,10 +795,10 @@ void ObjTabelle::setARBreite(
 {
     if (msaRam->z(sNum))
     {
-        Rahmen* tmp = msaRam->z(sNum)->z(zNum);
+        Border* tmp = msaRam->z(sNum)->z(zNum);
         if (!tmp)
         {
-            tmp = new LRahmen();
+            tmp = new LBorder();
             msaRam->z(sNum)->set(tmp, zNum);
         }
         tmp->setRamenBreite(br);
@@ -1061,7 +1061,7 @@ void ObjTabelle::doTastaturEreignis(TastaturEreignis& te)
         te.verarbeitet = nTak(ntakParam, this, te);
 }
 
-void ObjTabelle::render(Bild& zRObj) // renders the table into zRObj
+void ObjTabelle::render(Image& zRObj) // renders the table into zRObj
 {
     if (hatStyleNicht(Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
@@ -1112,15 +1112,15 @@ void ObjTabelle::render(Bild& zRObj) // renders the table into zRObj
                 obj->render(zRObj);
                 if (selected.x == s && selected.y == z)
                 {
-                    Rahmen* tmp_aRam = aRam;
+                    Border* tmp_aRam = aRam;
                     AlphaFeld* tmp_aAf = aAf;
-                    bool aRamB = hatStyle(Style::AuswahlRahmen) && tmp_aRam;
+                    bool aRamB = hatStyle(Style::SelectionBorder) && tmp_aRam;
                     bool aAfB = hatStyle(Style::AuswahlBuffer) && tmp_aAf;
                     if (hatStyle(Style::AuswahlMultistyled))
                     {
-                        tmp_aRam = getARahmen(s, z);
+                        tmp_aRam = getABorder(s, z);
                         tmp_aAf = getAAlphaFeld(s, z);
-                        aRamB = hatMsStyle(s, z, Style::AuswahlRahmen)
+                        aRamB = hatMsStyle(s, z, Style::SelectionBorder)
                              && tmp_aRam;
                         aAfB
                             = hatMsStyle(s, z, Style::AuswahlBuffer) && tmp_aAf;
@@ -1463,12 +1463,12 @@ int ObjTabelle::getRasterBreite() const // returns the width of the grid
     return rasterBreite;
 }
 
-Rahmen* ObjTabelle::getARahmen() const // returns the selection border
+Border* ObjTabelle::getABorder() const // returns the selection border
 {
-    return aRam ? dynamic_cast<Rahmen*>(aRam->getThis()) : 0;
+    return aRam ? dynamic_cast<Border*>(aRam->getThis()) : 0;
 }
 
-Rahmen* ObjTabelle::zARahmen() const
+Border* ObjTabelle::zABorder() const
 {
     return aRam;
 }
@@ -1483,16 +1483,16 @@ AlphaFeld* ObjTabelle::zAAlphaFeld() const
     return aAf;
 }
 
-Rahmen* ObjTabelle::getARahmen(
+Border* ObjTabelle::getABorder(
     int sNum, int zNum) const // returns the selection border
 {
-    RCArray<Rahmen>* tmp = msaRam->z(sNum);
+    RCArray<Border>* tmp = msaRam->z(sNum);
     return tmp ? tmp->get(zNum) : 0;
 }
 
-Rahmen* ObjTabelle::zARahmen(int sNum, int zNum) const
+Border* ObjTabelle::zABorder(int sNum, int zNum) const
 {
-    RCArray<Rahmen>* tmp = msaRam->z(sNum);
+    RCArray<Border>* tmp = msaRam->z(sNum);
     return tmp ? tmp->z(zNum) : 0;
 }
 
@@ -1508,17 +1508,17 @@ AlphaFeld* ObjTabelle::zAAlphaFeld(int sNum, int zNum) const
     return msaAf->z(sNum) ? msaAf->z(sNum)->z(zNum) : 0;
 }
 
-Rahmen* ObjTabelle::getARahmen(const char* spaltenName,
+Border* ObjTabelle::getABorder(const char* spaltenName,
     const char* zeilenName) const // returns the selection border
 {
-    return getARahmen(
+    return getABorder(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Rahmen* ObjTabelle::zARahmen(
+Border* ObjTabelle::zABorder(
     const char* spaltenName, const char* zeilenName) const
 {
-    return zARahmen(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
 AlphaFeld* ObjTabelle::getAAlphaFeld(const char* spaltenName,
@@ -1535,16 +1535,16 @@ AlphaFeld* ObjTabelle::zAAlphaFeld(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Rahmen* ObjTabelle::getARahmen(
+Border* ObjTabelle::getABorder(
     Text* spaltenName, Text* zeilenName) const // returns the selection border
 {
-    return getARahmen(
+    return getABorder(
         getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
-Rahmen* ObjTabelle::zARahmen(Text* spaltenName, Text* zeilenName) const
+Border* ObjTabelle::zABorder(Text* spaltenName, Text* zeilenName) const
 {
-    return zARahmen(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
+    return zABorder(getSpaltenNummer(spaltenName), getZeilenNummer(zeilenName));
 }
 
 AlphaFeld* ObjTabelle::getAAlphaFeld(Text* spaltenName,
@@ -1622,16 +1622,16 @@ Drawable* ObjTabelle::dublizieren() const // Creates a copy of the table
     obj->setTastaturEreignis(tak);
     if (toolTip) obj->setToolTipZ((ToolTip*)toolTip->dublizieren());
     obj->setStyle(style);
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
     obj->setHintergrundFarbe(hintergrundFarbe);
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
     obj->setRasterFarbe(rasterFarbe);
     obj->setRasterBreite(rasterBreite);
-    if (aRam) obj->setARahmenZ((Rahmen*)aRam->dublizieren());
+    if (aRam) obj->setABorderZ((Border*)aRam->dublizieren());
     if (aAf) obj->setAAlphaFeldZ((AlphaFeld*)aAf->dublizieren());
     for (int s = 0; s < spaltenAnzahl; ++s)
     {
@@ -1659,8 +1659,8 @@ Drawable* ObjTabelle::dublizieren() const // Creates a copy of the table
             if (styles->z(s) && styles->z(s)->hat(z))
                 obj->setMsStyle(s, z, styles->z(s)->get(z));
             if (msaRam->z(s) && msaRam->z(s)->z(z))
-                obj->setARahmenZ(
-                    s, z, (Rahmen*)msaRam->z(s)->z(z)->dublizieren());
+                obj->setABorderZ(
+                    s, z, (Border*)msaRam->z(s)->z(z)->dublizieren());
             if (msaAf->z(s) && msaAf->z(s)->z(z))
                 obj->setAAlphaFeldZ(
                     s, z, (AlphaFeld*)msaAf->z(s)->z(z)->dublizieren());

Table.h

@@ -6,7 +6,7 @@
 
 namespace Framework
 {
-    class Rahmen;     //! Border.h
+    class Border;     //! Border.h
     class AlphaFeld;  //! AlphaField.h
     class VScrollBar; //! Scroll.h
     class HScrollBar; //! Scroll.h
@@ -50,7 +50,7 @@ namespace Framework
             static const __int64 ZeilenBeweglich = 0x00800000;
             //! If this flag is set, the field that the user can select
             //! with the Erlaubt flag gets a different border
-            static const __int64 AuswahlRahmen = 0x0080000;
+            static const __int64 SelectionBorder = 0x0080000;
             //! If this flag is set, the field that the user can select
             //! with the Erlaubt flag gets a different AlphaFeld
             static const __int64 AuswahlBuffer = 0x00100000;
@@ -73,11 +73,11 @@ namespace Framework
                                          | ZeilenHeightMax | ZeilenHeightMax;
             //! Combines the flags: VScroll, HScroll
             static const __int64 scroll = VScroll | HScroll;
-            //! Combines the flags: Rahmen, Erlaubt,
+            //! Combines the flags: Border, Erlaubt,
             //! Sichtbar, SpaltenBeweglich,
-            //! AuswahlBuffer, AuswahlRahmen, Raster
+            //! AuswahlBuffer, SelectionBorder, Raster
             static const __int64 normal
-                = Rahmen | Erlaubt | Sichtbar | AuswahlBuffer | AuswahlRahmen
+                = Border | Erlaubt | Sichtbar | AuswahlBuffer | SelectionBorder
                 | Raster | MEIgnoreInside | MEIgnoreParentInside
                 | MEIgnoreSichtbar | MEIgnoreVerarbeitet;
         };
@@ -100,9 +100,9 @@ namespace Framework
         Punkt selected;
         int rasterFarbe;
         int rasterBreite;
-        Rahmen* aRam;
+        Border* aRam;
         AlphaFeld* aAf;
-        RCArray<RCArray<Rahmen>>* msaRam;
+        RCArray<RCArray<Border>>* msaRam;
         RCArray<RCArray<AlphaFeld>>* msaAf;
         RCArray<Array<__int64>>* styles;
         //! Processes mouse messages
@@ -297,7 +297,7 @@ namespace Framework
         DLLEXPORT void setRasterBreite(int br);
         //! Sets a pointer to the border drawn around the selected cell
         //! \param ram The border
-        DLLEXPORT void setARahmenZ(Rahmen* ram);
+        DLLEXPORT void setABorderZ(Border* ram);
         //! Sets the color of the border drawn around the selected cell
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setARFarbe(int f);
@@ -316,19 +316,19 @@ namespace Framework
         //! Sets a pointer to a border used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param ram The border
-        DLLEXPORT void setARahmenZ(int sNum, int zNum, Rahmen* ram);
+        DLLEXPORT void setABorderZ(int sNum, int zNum, Border* ram);
         //! Sets a pointer to a border used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param ram The border
-        DLLEXPORT void setARahmenZ(
-            const char* spaltenName, const char* zeilenName, Rahmen* ram);
+        DLLEXPORT void setABorderZ(
+            const char* spaltenName, const char* zeilenName, Border* ram);
         //! Sets a pointer to a border used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param spaltenName The name of the
         //! column \param zeilenName The name of the row
         //! \param ram The border
-        DLLEXPORT void setARahmenZ(
-            Text* spaltenName, Text* zeilenName, Rahmen* ram);
+        DLLEXPORT void setABorderZ(
+            Text* spaltenName, Text* zeilenName, Border* ram);
         //! Sets the color of a border used with the AuswahlMultistyled flag
         //! when selecting a specific cell \param sNum The index of the column
         //! \param zNum The index of the row \param f The color in A8R8G8B8
@@ -492,7 +492,7 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the number of columns
         DLLEXPORT int getSpaltenAnzahl() const;
         //! Returns the number of rows
@@ -638,10 +638,10 @@ namespace Framework
         //! Returns the width of the grid in pixels
         DLLEXPORT int getRasterBreite() const;
         //! Returns a pointer to the border used for the selected field
-        DLLEXPORT Rahmen* getARahmen() const;
+        DLLEXPORT Border* getABorder() const;
         //! Returns a pointer to the border without increased reference counter
         //! used for the selected field
-        DLLEXPORT Rahmen* zARahmen() const;
+        DLLEXPORT Border* zABorder() const;
         //! Returns a pointer to the color gradient used for the selected field
         DLLEXPORT AlphaFeld* getAAlphaFeld() const;
         //! Returns a pointer to the color gradient without increased reference
@@ -650,11 +650,11 @@ namespace Framework
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param sNum The index of the
         //! column \param zNum The index of the row
-        DLLEXPORT Rahmen* getARahmen(int sNum, int zNum) const;
+        DLLEXPORT Border* getABorder(int sNum, int zNum) const;
         //! Returns a pointer to the border without increased reference counter
         //! used with the AuswahlMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the row
-        DLLEXPORT Rahmen* zARahmen(int sNum, int zNum) const;
+        DLLEXPORT Border* zABorder(int sNum, int zNum) const;
         //! Returns a pointer to the color gradient used with the
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param sNum The index of the column \param zNum The index of the row
@@ -667,13 +667,13 @@ namespace Framework
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
         //! the column \param zeilenName The name of the row
-        DLLEXPORT Rahmen* getARahmen(
+        DLLEXPORT Border* getABorder(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the border without increased reference counter
         //! used with the AuswahlMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT Rahmen* zARahmen(
+        DLLEXPORT Border* zABorder(
             const char* spaltenName, const char* zeilenName) const;
         //! Returns a pointer to the color gradient used with the
         //! AuswahlMultistyled flag when selecting a specific cell
@@ -690,12 +690,12 @@ namespace Framework
         //! Returns a pointer to the border used with the AuswahlMultistyled
         //! flag when selecting a specific cell \param spaltenName The name of
         //! the column \param zeilenName The name of the row
-        DLLEXPORT Rahmen* getARahmen(Text* spaltenName, Text* zeilenName) const;
+        DLLEXPORT Border* getABorder(Text* spaltenName, Text* zeilenName) const;
         //! Returns a pointer to the border without increased reference counter
         //! used with the AuswahlMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column
         //! \param zeilenName The name of the row
-        DLLEXPORT Rahmen* zARahmen(Text* spaltenName, Text* zeilenName) const;
+        DLLEXPORT Border* zABorder(Text* spaltenName, Text* zeilenName) const;
         //! Returns a pointer to the color gradient used with the
         //! AuswahlMultistyled flag when selecting a specific cell
         //! \param spaltenName The name of the column

TextField.cpp

@@ -30,7 +30,7 @@ bool TextStyle::equals(const TextStyle& rhs)
 }
 #endif
 
-TextFeld::TextStyleManager::TextStyleManager()
+TextField::TextStyleManager::TextStyleManager()
     : ReferenceCounter(),
       renderer(new RCArray<TextRenderer>()),
       index(0),
@@ -49,7 +49,7 @@ TextFeld::TextStyleManager::TextStyleManager()
     textStyle.add(current);
 }
 
-TextFeld::TextStyleManager::~TextStyleManager()
+TextField::TextStyleManager::~TextStyleManager()
 {
     if (renderer) renderer->release();
     if (text) text->release();
@@ -58,7 +58,7 @@ TextFeld::TextStyleManager::~TextStyleManager()
 // Sets the style of a text section
 //  begin: the start position of the section
 //  end: the end position of the section (not included)
-void TextFeld::TextStyleManager::setTextStyle(
+void TextField::TextStyleManager::setTextStyle(
     int begin, int end, TextStyle style)
 {
     if (begin < 0 || begin > end || begin > text->getLength()) return;
@@ -112,7 +112,7 @@ void TextFeld::TextStyleManager::setTextStyle(
 // Removes a text section
 //  begin: the index of the first affected character
 //  end: the index of the first character after the section
-void TextFeld::TextStyleManager::removeText(int begin, int end)
+void TextField::TextStyleManager::removeText(int begin, int end)
 {
     int sc = textStyle.getEintragAnzahl();
     for (int i = 1; i < sc; i++)
@@ -137,7 +137,7 @@ void TextFeld::TextStyleManager::removeText(int begin, int end)
 // Inserts text at a specific position
 //  pos: the position of the new text section
 //  text: the new text
-void TextFeld::TextStyleManager::insertText(int pos, const char* text)
+void TextField::TextStyleManager::insertText(int pos, const char* text)
 {
     int len = textLength(text);
     this->text->insert(pos, text);
@@ -155,7 +155,7 @@ void TextFeld::TextStyleManager::insertText(int pos, const char* text)
 }
 
 // Removes unnecessary duplicate styles
-void TextFeld::TextStyleManager::cleanupStyles()
+void TextField::TextStyleManager::cleanupStyles()
 {
     int sc = textStyle.getEintragAnzahl();
     TextStyle last = textStyle.get(0);
@@ -182,13 +182,13 @@ void TextFeld::TextStyleManager::cleanupStyles()
 }
 
 // returns a reference to the style object
-TextStyle& TextFeld::TextStyleManager::currentStyle()
+TextStyle& TextField::TextStyleManager::currentStyle()
 {
     return current;
 }
 
 // returns the current text renderer
-TextRenderer* TextFeld::TextStyleManager::zCurrentRenderer()
+TextRenderer* TextField::TextStyleManager::zCurrentRenderer()
 {
     if (renderer->getEintragAnzahl() == 0) return 0;
     TextRenderer* tr = renderer->z(current.rendererIndex);
@@ -198,7 +198,7 @@ TextRenderer* TextFeld::TextStyleManager::zCurrentRenderer()
 }
 
 // changes the content of the style object to the style of the next character
-bool TextFeld::TextStyleManager::nextStyle()
+bool TextField::TextStyleManager::nextStyle()
 {
     index++;
     if (textStyle.getEintragAnzahl() > styleIndex + 1
@@ -211,7 +211,7 @@ bool TextFeld::TextStyleManager::nextStyle()
 // character
 //  index: the index of the character to jump to
 //  returns 0 if the character does not exist
-bool TextFeld::TextStyleManager::stepTo(int index)
+bool TextField::TextStyleManager::stepTo(int index)
 {
     resetIteration();
     while (this->index < index && nextStyle())
@@ -220,7 +220,7 @@ bool TextFeld::TextStyleManager::stepTo(int index)
 }
 
 // changes the content of the style object to the style of the first character
-void TextFeld::TextStyleManager::resetIteration()
+void TextField::TextStyleManager::resetIteration()
 {
     index = 0;
     styleIndex = 0;
@@ -229,7 +229,7 @@ void TextFeld::TextStyleManager::resetIteration()
 
 // Returns the style of a specific character\n//  index: The index of the
 // character
-TextStyle TextFeld::TextStyleManager::getTextStyle(int index) const
+TextStyle TextField::TextStyleManager::getTextStyle(int index) const
 {
     TextStyle last = textStyle.get(0);
     int ind = 0;
@@ -244,9 +244,9 @@ TextStyle TextFeld::TextStyleManager::getTextStyle(int index) const
     return last;
 }
 
-// Contents of the TextFeld class from TextField.h
+// Contents of the TextField class from TextField.h
 // Constructor
-TextFeld::TextFeld()
+TextField::TextField()
     : DrawableBackground(),
       tm(new TextStyleManager()),
       autoLineBreakSpacing(0),
@@ -263,13 +263,13 @@ TextFeld::TextFeld()
 }
 
 // Destructor
-TextFeld::~TextFeld()
+TextField::~TextField()
 {
     tm->release();
     if (autoLineBreakSpacing) autoLineBreakSpacing->release();
 }
 
-void TextFeld::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
+void TextField::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
 {
     if (!userRet) return;
     if (hatStyleNicht(Style::Editierbar))
@@ -428,7 +428,7 @@ void TextFeld::doMausEreignis(MausEreignis& me, bool userRet) // Mouse event
     me.verarbeitet = 1;
 }
 
-int TextFeld::getTextHeight() const
+int TextField::getTextHeight() const
 {
     if (!tm || !tm->text) return 0;
     tm->resetIteration();
@@ -468,7 +468,7 @@ int TextFeld::getTextHeight() const
     return th;
 }
 
-int TextFeld::getTextWidth() const
+int TextField::getTextWidth() const
 {
     if (!tm || !tm->text) return 0;
     tm->resetIteration();
@@ -506,13 +506,13 @@ int TextFeld::getTextWidth() const
 // charEvent: a function that is called when the mouse is on a
 // specific character and the interactParam in the style != 0
 //  call: charEvent( charIndex, interactParam, mausEreignis );
-void TextFeld::setCharEvent(
+void TextField::setCharEvent(
     std::function<void(int, int, MausEreignis me)> charEvent)
 {
     this->charEvent = charEvent;
 }
 
-void TextFeld::setText(Text* txt) // sets the displayed text
+void TextField::setText(Text* txt) // sets the displayed text
 {
     lockDrawable();
     if (!tm->text) tm->text = new Text();
@@ -524,7 +524,7 @@ void TextFeld::setText(Text* txt) // sets the displayed text
     txt->release();
 }
 
-void TextFeld::setTextZ(Text* txt) // sets a pointer to the displayed text
+void TextField::setTextZ(Text* txt) // sets a pointer to the displayed text
 {
     lockDrawable();
     if (tm->text) tm->text->release();
@@ -535,7 +535,7 @@ void TextFeld::setTextZ(Text* txt) // sets a pointer to the displayed text
     unlockDrawable();
 }
 
-void TextFeld::setText(const char* txt) // sets the displayed text
+void TextField::setText(const char* txt) // sets the displayed text
 {
     lockDrawable();
     if (!tm->text) tm->text = new Text();
@@ -565,7 +565,7 @@ void TextFeld::setText(const char* txt) // sets the displayed text
 //          \x7: deactivates underline
 //          \x8FFFFFFFF: set interact param.
 //              FFFFFFFF is an 8-digit hex value
-void TextFeld::setFormattedText(const char* txt)
+void TextField::setFormattedText(const char* txt)
 {
     lockDrawable();
     if (!tm->text) tm->text = new Text();
@@ -668,13 +668,13 @@ void TextFeld::setFormattedText(const char* txt)
 
 // inserts line breaks so that the text does not exceed the width of the text
 // field
-void TextFeld::addLineBreaks(const char* spacing)
+void TextField::addLineBreaks(const char* spacing)
 {
     if (!tm->text) return;
     setFormattedText(addLineBreaksToText(tm->text->getText(), spacing));
 }
 
-Text TextFeld::addLineBreaksToText(
+Text TextField::addLineBreaksToText(
     const char* txt, const char* spacing, bool includeFormat) const
 {
     int lastPos = -1;
@@ -793,7 +793,7 @@ Text TextFeld::addLineBreaksToText(
     return result;
 }
 
-void TextFeld::setAutoLineBreakSpacing(const char* spacing)
+void TextField::setAutoLineBreakSpacing(const char* spacing)
 {
     if (!autoLineBreakSpacing) autoLineBreakSpacing = new Text();
     autoLineBreakSpacing->setText(spacing);
@@ -802,12 +802,12 @@ void TextFeld::setAutoLineBreakSpacing(const char* spacing)
 // Sets the style of a text section
 //  begin: the start position of the section
 //  end: the end position of the section (not included)
-void TextFeld::setTextStyle(int begin, int end, TextStyle style)
+void TextField::setTextStyle(int begin, int end, TextStyle style)
 {
     tm->setTextStyle(begin, end, style);
 }
 
-void TextFeld::addZeile(const char* zeile) // appends a line
+void TextField::addZeile(const char* zeile) // appends a line
 {
     if (tm->text)
     {
@@ -823,7 +823,7 @@ void TextFeld::addZeile(const char* zeile) // appends a line
         if (r)
         {
             bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-            int rbr = (rahmen && hatStyle(Style::Rahmen)) ? rahmen->getRBreite()
+            int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
                                                           : 0;
             r->setSchriftSize(
                 tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
@@ -843,7 +843,7 @@ void TextFeld::addZeile(const char* zeile) // appends a line
 // Appends a line to the text
 //  zeile: The new line
 //  color: The color of the line
-void TextFeld::addZeile(const char* zeile, int color)
+void TextField::addZeile(const char* zeile, int color)
 {
     if (tm->text)
     {
@@ -859,7 +859,7 @@ void TextFeld::addZeile(const char* zeile, int color)
         if (r)
         {
             bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-            int rbr = (rahmen && hatStyle(Style::Rahmen)) ? rahmen->getRBreite()
+            int rbr = (rahmen && hatStyle(Style::Border)) ? rahmen->getRBreite()
                                                           : 0;
             r->setSchriftSize(
                 tm->textStyle.get(tm->textStyle.getEintragAnzahl() - 1)
@@ -880,7 +880,7 @@ void TextFeld::addZeile(const char* zeile, int color)
 }
 
 // Deselects all text sections
-void TextFeld::deselectAuswahl()
+void TextField::deselectAuswahl()
 {
     for (int i = 0; i < tm->textStyle.getEintragAnzahl(); i++)
     {
@@ -894,7 +894,7 @@ void TextFeld::deselectAuswahl()
     tm->cleanupStyles();
 }
 
-void TextFeld::setAuswahl(int pos1, int pos2) // sets the selected text
+void TextField::setAuswahl(int pos1, int pos2) // sets the selected text
 {
     deselectAuswahl();
     TextStyle s = tm->getTextStyle(pos1);
@@ -902,7 +902,7 @@ void TextFeld::setAuswahl(int pos1, int pos2) // sets the selected text
     tm->setTextStyle(pos1, pos2, s);
 }
 
-void TextFeld::setAuswahl(Punkt& auswahl)
+void TextField::setAuswahl(Punkt& auswahl)
 {
     deselectAuswahl();
     TextStyle s = tm->getTextStyle(auswahl.x);
@@ -911,14 +911,14 @@ void TextFeld::setAuswahl(Punkt& auswahl)
     rend = 1;
 }
 
-void TextFeld::addAuswahl(int pos1, int pos2)
+void TextField::addAuswahl(int pos1, int pos2)
 {
     TextStyle s = tm->getTextStyle(pos1);
     s.selected = 1;
     tm->setTextStyle(pos1, pos2, s);
 }
 
-void TextFeld::addAuswahl(Punkt& auswahl)
+void TextField::addAuswahl(Punkt& auswahl)
 {
     TextStyle s = tm->getTextStyle(auswahl.x);
     s.selected = 1;
@@ -929,7 +929,7 @@ void TextFeld::addAuswahl(Punkt& auswahl)
 // Sets the selected text section
 //  begin: The cursor position in the text
 //  end: The position in the text up to which the text should be colored
-void TextFeld::invertAuswahl(int begin, int end)
+void TextField::invertAuswahl(int begin, int end)
 {
     for (int i = begin; i < end; i++)
     {
@@ -942,7 +942,7 @@ void TextFeld::invertAuswahl(int begin, int end)
 
 // replaces all selected text sections with a text
 //  text: the new text
-void TextFeld::replaceAuswahl(const char* text)
+void TextField::replaceAuswahl(const char* text)
 {
     tm->cleanupStyles();
     int sa = tm->textStyle.getEintragAnzahl();
@@ -967,7 +967,7 @@ void TextFeld::replaceAuswahl(const char* text)
     }
 }
 
-void TextFeld::setTextRendererZ(TextRenderer* textRd)
+void TextField::setTextRendererZ(TextRenderer* textRd)
 {
     if (tm->renderer)
         tm->renderer->leeren();
@@ -979,7 +979,7 @@ void TextFeld::setTextRendererZ(TextRenderer* textRd)
 
 // Adds a TextRenderer
 //  textRd: The text renderer
-void TextFeld::addTextRendererZ(TextRenderer* textRd)
+void TextField::addTextRendererZ(TextRenderer* textRd)
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
     tm->renderer->add(textRd);
@@ -987,35 +987,35 @@ void TextFeld::addTextRendererZ(TextRenderer* textRd)
 
 // Sets the used TextRenderers
 //  textRd: The text renderers
-void TextFeld::setTextRendererZ(RCArray<TextRenderer>* textRd)
+void TextField::setTextRendererZ(RCArray<TextRenderer>* textRd)
 {
     if (tm->renderer) tm->renderer->release();
     tm->renderer = textRd;
 }
 
-void TextFeld::setSchriftZ(Schrift* schrift) // sets a pointer to the font
+void TextField::setFontZ(Font* schrift) // sets a pointer to the font
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
     if (!tm->renderer->getEintragAnzahl())
         tm->renderer->add(new TextRenderer(schrift));
     else
-        tm->renderer->z(0)->setSchriftZ(schrift);
+        tm->renderer->z(0)->setFontZ(schrift);
     rend = 1;
 }
 
 // Sets a pointer to the font
 //  rendererIndex: The index of the renderer whose font should be set
 //  schrift: The font to be used for text drawing.
-void TextFeld::setSchriftZ(int rendererIndex, Schrift* schrift)
+void TextField::setFontZ(int rendererIndex, Font* schrift)
 {
     if (!tm->renderer) tm->renderer = new RCArray<TextRenderer>();
     if (tm->renderer->getEintragAnzahl() <= rendererIndex)
         tm->renderer->add(new TextRenderer(schrift), rendererIndex);
     else
-        tm->renderer->z(rendererIndex)->setSchriftZ(schrift);
+        tm->renderer->z(rendererIndex)->setFontZ(schrift);
 }
 
-void TextFeld::setSchriftSize(unsigned char gr) // sets the font size
+void TextField::setSchriftSize(unsigned char gr) // sets the font size
 {
     TextStyle s = tm->textStyle.get(0);
     s.fontSize = gr;
@@ -1027,7 +1027,7 @@ void TextFeld::setSchriftSize(unsigned char gr) // sets the font size
 //  begin: The index of the first affected character
 //  end: The index of the first unaffected character
 //  gr: The font size to be used for text drawing
-void TextFeld::setSchriftSize(int begin, int end, unsigned char gr)
+void TextField::setSchriftSize(int begin, int end, unsigned char gr)
 {
     TextStyle s = tm->getTextStyle(begin);
     s.fontSize = gr;
@@ -1035,7 +1035,7 @@ void TextFeld::setSchriftSize(int begin, int end, unsigned char gr)
     rend = 1;
 }
 
-void TextFeld::setSchriftFarbe(int fc) // sets the font color
+void TextField::setSchriftFarbe(int fc) // sets the font color
 {
     TextStyle s = tm->textStyle.get(0);
     s.fontColor = fc;
@@ -1047,7 +1047,7 @@ void TextFeld::setSchriftFarbe(int fc) // sets the font color
 //  begin: The index of the first affected character
 //  end: The index of the first unaffected character
 //  fc: The color to be used for text drawing
-void TextFeld::setSchriftFarbe(int begin, int end, int fc)
+void TextField::setSchriftFarbe(int begin, int end, int fc)
 {
     TextStyle s = tm->getTextStyle(begin);
     s.fontColor = fc;
@@ -1055,13 +1055,13 @@ void TextFeld::setSchriftFarbe(int begin, int end, int fc)
     rend = 1;
 }
 
-void TextFeld::setSchowChar(unsigned char c) // for password field *
+void TextField::setSchowChar(unsigned char c) // for password field *
 {
     showChar = c;
     rend = 1;
 }
 
-void TextFeld::setVScrollZuZeile(int zeile) // scrolls to line
+void TextField::setVScrollZuZeile(int zeile) // scrolls to line
 {
     if (vertikalScrollBar && tm->renderer && tm->renderer->getEintragAnzahl()
         && tm->text && hatStyle(Style::Mehrzeilig))
@@ -1105,7 +1105,7 @@ void TextFeld::setVScrollZuZeile(int zeile) // scrolls to line
     }
 }
 
-void TextFeld::updateVScroll(int pos) // scrolls down
+void TextField::updateVScroll(int pos) // scrolls down
 {
     if (pos == -1) pos = cpos;
     if (vertikalScrollBar)
@@ -1117,7 +1117,7 @@ void TextFeld::updateVScroll(int pos) // scrolls down
         {
             if (hatStyleNicht(Style::Mehrzeilig)) tm->text->remove('\n');
             hi = gr.y;
-            if (hatStyle(Style::Rahmen) && rahmen)
+            if (hatStyle(Style::Border) && rahmen)
                 hi -= rahmen->getRBreite() * 2;
             if (hatStyle(Style::HScroll) && horizontalScrollBar) hi -= 15;
             int th = 0;
@@ -1177,7 +1177,7 @@ void TextFeld::updateVScroll(int pos) // scrolls down
     }
 }
 
-void TextFeld::updateHScroll(int pos) // scrolls to cursor position
+void TextField::updateHScroll(int pos) // scrolls to cursor position
 {
     if (pos == -1) pos = cpos;
     lockDrawable();
@@ -1185,7 +1185,7 @@ void TextFeld::updateHScroll(int pos) // scrolls to cursor position
     {
         if (hatStyleNicht(Style::Mehrzeilig)) tm->text->remove('\n');
         int br = gr.x;
-        if (hatStyle(Style::Rahmen) && rahmen) br -= rahmen->getRBreite() * 2;
+        if (hatStyle(Style::Border) && rahmen) br -= rahmen->getRBreite() * 2;
         if (hatStyle(Style::VScroll) && vertikalScrollBar) br -= 15;
         tm->resetIteration();
         int maxBr = 0;
@@ -1225,31 +1225,31 @@ void TextFeld::updateHScroll(int pos) // scrolls to cursor position
 
 // Returns the width in pixels needed to fully display the current text with
 // the current styles
-int TextFeld::getNeededWidth()
+int TextField::getNeededWidth()
 {
     int maxBr = 0;
     lockDrawable();
     if (tm->text && tm->renderer) maxBr = getTextWidth();
     unlockDrawable();
     bool vs = vertikalScrollBar && hatStyle(Style::VScroll);
-    bool r = rahmen && hatStyle(Style::Rahmen);
+    bool r = rahmen && hatStyle(Style::Border);
     return maxBr + (r ? rahmen->getRBreite() * 2 : 0) + (vs ? 15 : 0);
 }
 
 // Returns the height in pixels needed to fully display the current text with
 // the current styles
-int TextFeld::getNeededHeight()
+int TextField::getNeededHeight()
 {
     int th = 0;
     lockDrawable();
     if (tm->text && tm->renderer) th = getTextHeight();
     unlockDrawable();
     bool hs = horizontalScrollBar && hatStyle(Style::HScroll);
-    bool r = rahmen && hatStyle(Style::Rahmen);
+    bool r = rahmen && hatStyle(Style::Border);
     return th + (r ? rahmen->getRBreite() * 2 : 0) + (hs ? 15 : 0);
 }
 
-bool TextFeld::tick(double tickval) // tick
+bool TextField::tick(double tickval) // tick
 {
     if (hatStyle(Style::Fokus))
     {
@@ -1261,7 +1261,7 @@ bool TextFeld::tick(double tickval) // tick
     return DrawableBackground::tick(tickval);
 }
 
-void TextFeld::doTastaturEreignis(TastaturEreignis& te)
+void TextField::doTastaturEreignis(TastaturEreignis& te)
 {
     bool ntakc = !te.verarbeitet;
     if (te.verarbeitet || hatStyleNicht(Style::Fokus)) return;
@@ -1310,7 +1310,7 @@ void TextFeld::doTastaturEreignis(TastaturEreignis& te)
                 rend = 1;
                 break;
             case T_Enter:
-                if (hatStyle(TextFeld::Style::Mehrzeilig))
+                if (hatStyle(TextField::Style::Mehrzeilig))
                 {
                     if (!tm->getTextStyle(cpos).selected)
                         tm->insertText(cpos, "\n");
@@ -1483,7 +1483,7 @@ void TextFeld::doTastaturEreignis(TastaturEreignis& te)
     release();
 }
 
-void TextFeld::render(Bild& zRObj) // draws to zRObj
+void TextField::render(Image& zRObj) // draws to zRObj
 {
     if (hatStyleNicht(Style::Sichtbar)) return;
     DrawableBackground::render(zRObj);
@@ -1569,57 +1569,57 @@ void TextFeld::render(Bild& zRObj) // draws to zRObj
 }
 
 // Constant
-Text* TextFeld::getText() const // returns the text
+Text* TextField::getText() const // returns the text
 {
     if (!tm->text) return 0;
     return dynamic_cast<Text*>(tm->text->getThis());
 }
 
-Text* TextFeld::zText() const // returns the text without reference counter
+Text* TextField::zText() const // returns the text without reference counter
 {
     return tm->text;
 }
 
-Schrift* TextFeld::getSchrift() const // returns the font
+Font* TextField::getFont() const // returns the font
 {
     tm->resetIteration();
-    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->getSchrift() : 0;
+    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->getFont() : 0;
 }
 
-Schrift*
-TextFeld::zSchrift() const // returns the font without reference counter
+Font*
+TextField::zFont() const // returns the font without reference counter
 {
     tm->resetIteration();
-    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->zSchrift() : 0;
+    return tm->zCurrentRenderer() ? tm->zCurrentRenderer()->zFont() : 0;
 }
 
 // Returns the font.
 //  rendererIndex: The index of the renderer whose font should be returned
 //  return: 0, if the font was not set
-Schrift* TextFeld::getSchrift(int rendererIndex) const
+Font* TextField::getFont(int rendererIndex) const
 {
     if (tm->renderer && tm->renderer->z(rendererIndex))
-        return tm->renderer->z(rendererIndex)->getSchrift();
+        return tm->renderer->z(rendererIndex)->getFont();
     return 0;
 }
 
 // Returns the font without increased reference counter
 //  rendererIndex: The index of the renderer whose font should be returned
 //  return: 0, if the font was not set
-Schrift* TextFeld::zSchrift(int rendererIndex) const
+Font* TextField::zFont(int rendererIndex) const
 {
     if (tm->renderer && tm->renderer->z(rendererIndex))
-        return tm->renderer->z(rendererIndex)->zSchrift();
+        return tm->renderer->z(rendererIndex)->zFont();
     return 0;
 }
 
-TextRenderer* TextFeld::getTextRenderer() const
+TextRenderer* TextField::getTextRenderer() const
 {
     tm->resetIteration();
     return dynamic_cast<TextRenderer*>(tm->zCurrentRenderer()->getThis());
 }
 
-TextRenderer* TextFeld::zTextRenderer() const
+TextRenderer* TextField::zTextRenderer() const
 {
     tm->resetIteration();
     return tm->zCurrentRenderer();
@@ -1628,7 +1628,7 @@ TextRenderer* TextFeld::zTextRenderer() const
 // Returns the TextRenderer.
 //  index: The index of the renderer to be returned
 //  return: 0, if the TextRenderer was not set
-TextRenderer* TextFeld::getTextRenderer(int index) const
+TextRenderer* TextField::getTextRenderer(int index) const
 {
     if (tm->renderer && tm->renderer->z(index)) return tm->renderer->get(index);
     return 0;
@@ -1637,13 +1637,13 @@ TextRenderer* TextFeld::getTextRenderer(int index) const
 // Returns the TextRenderer without increased reference counter
 //  index: The index of the renderer to be returned
 //  return: 0, if the TextRenderer was not set
-TextRenderer* TextFeld::zTextRenderer(int index) const
+TextRenderer* TextField::zTextRenderer(int index) const
 {
     if (tm->renderer && tm->renderer->z(index)) return tm->renderer->z(index);
     return 0;
 }
 
-unsigned char TextFeld::getSchriftSize() const // returns the font size
+unsigned char TextField::getSchriftSize() const // returns the font size
 {
     tm->resetIteration();
     return tm->current.fontSize;
@@ -1651,13 +1651,13 @@ unsigned char TextFeld::getSchriftSize() const // returns the font size
 
 // Returns the font size
 //  index: The index of the character
-unsigned char TextFeld::getSchriftSize(int index) const
+unsigned char TextField::getSchriftSize(int index) const
 {
     tm->resetIteration();
     return tm->current.fontSize;
 }
 
-int TextFeld::getSchriftFarbe() const // returns the font color
+int TextField::getSchriftFarbe() const // returns the font color
 {
     tm->resetIteration();
     return tm->current.fontColor;
@@ -1665,24 +1665,24 @@ int TextFeld::getSchriftFarbe() const // returns the font color
 
 // Returns the font color in A8R8G8B8 format
 //  index: The index of the character
-int TextFeld::getSchriftFarbe(int index) const
+int TextField::getSchriftFarbe(int index) const
 {
     return tm->getTextStyle(index).fontColor;
 }
 
-unsigned char TextFeld::getShowChar() const // returns the display character
+unsigned char TextField::getShowChar() const // returns the display character
 {
     return showChar;
 }
 
-int TextFeld::getCursorPos() const
+int TextField::getCursorPos() const
 {
     return cpos;
 }
 
 // Returns 1 if the character is selected
 //  index: The index of the character
-bool TextFeld::isCharSelected(int index) const
+bool TextField::isCharSelected(int index) const
 {
     return tm->getTextStyle(index).selected;
 }
@@ -1691,7 +1691,7 @@ bool TextFeld::isCharSelected(int index) const
 //  mx: the x position of the mouse relative to the text field position
 //  my: the y position of the mouse relative to the text field position
 //  return: -1, if no character is at the position
-int TextFeld::getTextIndexAt(int mx, int my) const
+int TextField::getTextIndexAt(int mx, int my) const
 {
     if (!tm || !tm->text || !tm->zCurrentRenderer()) return -1;
     int tbr = getTextWidth();
@@ -1751,7 +1751,7 @@ int TextFeld::getTextIndexAt(int mx, int my) const
 // the mouse is clicked
 //  mx: the x position of the mouse relative to the text field position
 //  my: the y position of the mouse relative to the text field position
-int TextFeld::getCurserPosAt(int mx, int my) const
+int TextField::getCurserPosAt(int mx, int my) const
 {
     if (!tm || !tm->text || !tm->zCurrentRenderer())
         return tm->text->getLength();
@@ -1814,21 +1814,21 @@ int TextFeld::getCurserPosAt(int mx, int my) const
 
 // Returns the style of a specific character
 //  index: The index of the character
-TextStyle TextFeld::getTextStyle(int index) const
+TextStyle TextField::getTextStyle(int index) const
 {
     return tm->getTextStyle(index);
 }
 
 // returns the string that is inserted after each line break when using
 // the AutoLineBreak style
-Text TextFeld::getAutoLineBreakSpacing() const
+Text TextField::getAutoLineBreakSpacing() const
 {
     return autoLineBreakSpacing ? *autoLineBreakSpacing : Text("");
 }
 
-Drawable* TextFeld::dublizieren() const // Creates a copy of the drawing
+Drawable* TextField::dublizieren() const // Creates a copy of the drawing
 {
-    TextFeld* obj = new TextFeld();
+    TextField* obj = new TextField();
     obj->setPosition(pos);
     obj->setSize(gr);
     obj->setMausEreignisParameter(makParam);
@@ -1850,10 +1850,10 @@ Drawable* TextFeld::dublizieren() const // Creates a copy of the drawing
     obj->setHintergrundFarbe(hintergrundFarbe);
     if (hintergrundFeld)
         obj->setAlphaFeldZ((AlphaFeld*)hintergrundFeld->dublizieren());
-    if (rahmen) obj->setRahmenZ((Rahmen*)rahmen->dublizieren());
-    if (hintergrundBild)
-        obj->setHintergrundBild(
-            dynamic_cast<Bild*>(hintergrundBild->getThis()));
+    if (rahmen) obj->setBorderZ((Border*)rahmen->dublizieren());
+    if (hintergrundImage)
+        obj->setHintergrundImage(
+            dynamic_cast<Image*>(hintergrundImage->getThis()));
     if (vertikalScrollBar)
     {
         obj->setVertikalKlickScroll(vertikalScrollBar->getKlickScroll());

TextField.h

@@ -5,11 +5,11 @@
 
 namespace Framework
 {
-    class Schrift;    //! Font.h
+    class Font;    //! Font.h
     class Text;       //! Text.h
     class AlphaFeld;  //! AlphaField.h
-    class Rahmen;     //! Border.h
-    class TextFeld;   //! from this file
+    class Border;     //! Border.h
+    class TextField;   //! from this file
     class VScrollBar; //! Scroll.h
     class HScrollBar; //! Scroll.h
     class TextRenderer;
@@ -29,7 +29,7 @@ namespace Framework
     };
 
     //! Manages a text field
-    class TextFeld : public DrawableBackground
+    class TextField : public DrawableBackground
     {
     public:
         class TextStyleManager : public virtual ReferenceCounter
@@ -76,7 +76,7 @@ namespace Framework
             //! Returns the style of a specific character
             //! \param index The index of the character
             DLLEXPORT TextStyle getTextStyle(int index) const;
-            friend TextFeld;
+            friend TextField;
         };
 
         class Style : public DrawableBackground::Style
@@ -100,16 +100,16 @@ namespace Framework
 
             //! Combines the flags HCenter and VCenter
             static const __int64 Center = HCenter | VCenter;
-            //! Combines the flags Sichtbar, Erlaubt, Rahmen,
+            //! Combines the flags Sichtbar, Erlaubt, Border,
             //! Buffered, VCenter
-            static const __int64 TextFeld
-                = Sichtbar | Erlaubt | Rahmen | Buffered | VCenter | Editierbar;
+            static const __int64 TextField
+                = Sichtbar | Erlaubt | Border | Buffered | VCenter | Editierbar;
             //! Combines the flags Sichtbar,
             //! Mehrzeilig
             static const __int64 Text = Sichtbar | Mehrzeilig | Erlaubt;
-            //! Combines the flags Sichtbar, Erlaubt, Rahmen,
+            //! Combines the flags Sichtbar, Erlaubt, Border,
             //! Hintergrund, Mehrzeilig, VScroll
-            static const __int64 TextGebiet = Sichtbar | Erlaubt | Rahmen
+            static const __int64 TextGebiet = Sichtbar | Erlaubt | Border
                                             | Hintergrund | Editierbar
                                             | Mehrzeilig | VScroll;
             //! Combines the flags VScroll and HScroll
@@ -134,9 +134,9 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT TextFeld();
+        DLLEXPORT TextField();
         //! Destructor
-        DLLEXPORT virtual ~TextFeld();
+        DLLEXPORT virtual ~TextField();
         //! charEvent: a function called when the mouse is on a specific
         //! character and the interactParam in the style is != 0
         //! \param charEvent charEvent( charIndex, interactParam, mausEreignis );
@@ -235,11 +235,11 @@ namespace Framework
         DLLEXPORT void setTextRendererZ(RCArray<TextRenderer>* textRd);
         //! Sets a pointer to the font
         //! \param schrift The font to use for text drawing.
-        DLLEXPORT void setSchriftZ(Schrift* schrift);
+        DLLEXPORT void setFontZ(Font* schrift);
         //! Sets a pointer to the font
         //! \param rendererIndex The index of the renderer whose font should
         //! be set \param schrift The font to use for text drawing.
-        DLLEXPORT void setSchriftZ(int rendererIndex, Schrift* schrift);
+        DLLEXPORT void setFontZ(int rendererIndex, Font* schrift);
         //! Sets the font size (default: 12)
         //! \param gr The font size to use for text drawing
         DLLEXPORT void setSchriftSize(unsigned char gr);
@@ -257,7 +257,7 @@ namespace Framework
         //! \param fc The color to use for text drawing
         DLLEXPORT void setSchriftFarbe(int begin, int end, int fc);
         //! Sets a character to use for drawing, regardless of the text
-        //! field's text (requires drawing flag: Rahmen)
+        //! field's text (requires drawing flag: Border)
         //! \param c The character to draw
         //! Example: setShowChar( '*' ); for password text fields
         DLLEXPORT void setSchowChar(unsigned char c);
@@ -289,7 +289,7 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the object to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT virtual void render(Bild& zRObj) override;
+        DLLEXPORT virtual void render(Image& zRObj) override;
         //! Returns the text from the text field
         DLLEXPORT Text* getText() const;
         //! Returns the text from the text field without increased reference
@@ -297,18 +297,18 @@ namespace Framework
         DLLEXPORT Text* zText() const;
         //! Returns the font.
         //! \return 0 if the font was not set
-        DLLEXPORT Schrift* getSchrift() const;
+        DLLEXPORT Font* getFont() const;
         //! Returns the font without increased reference counter
         //! \return 0 if the font was not set
-        DLLEXPORT Schrift* zSchrift() const;
+        DLLEXPORT Font* zFont() const;
         //! Returns the font.
         //! \param rendererIndex The index of the renderer whose font should
         //! be returned \return 0 if the font was not set
-        DLLEXPORT Schrift* getSchrift(int rendererIndex) const;
+        DLLEXPORT Font* getFont(int rendererIndex) const;
         //! Returns the font without increased reference counter
         //! \param rendererIndex The index of the renderer whose font should
         //! be returned \return 0 if the font was not set
-        DLLEXPORT Schrift* zSchrift(int rendererIndex) const;
+        DLLEXPORT Font* zFont(int rendererIndex) const;
         //! Returns the TextRenderer.
         //! \return 0 if the TextRenderer was not set
         DLLEXPORT TextRenderer* getTextRenderer() const;

Texture.cpp

@@ -29,7 +29,7 @@ Textur::~Textur()
 
 // Sets a pointer to the image that contains the texture
 //  b: The pointer to the image
-void Textur::setBildZ(Bild* b)
+void Textur::setImageZ(Image* b)
 {
     if (bild != b) changed = 1;
     if (bild) bild->release();
@@ -38,28 +38,28 @@ void Textur::setBildZ(Bild* b)
 
 // Sets the image that contains the texture by copying it
 //  b: The image to be copied
-void Textur::setBild(Bild* b)
+void Textur::setImage(Image* b)
 {
     if (!b) return;
     if (bild != b) changed = 1;
     if (!bild || bild->getBreite() != b->getBreite()
         || bild->getHeight() != b->getHeight())
     {
-        if (!bild) bild = new Bild();
-        bild->neuBild(b->getBreite(), b->getHeight(), 0);
+        if (!bild) bild = new Image();
+        bild->neuImage(b->getBreite(), b->getHeight(), 0);
     }
-    bild->drawBild(0, 0, bild->getBreite(), bild->getHeight(), *b);
+    bild->drawImage(0, 0, bild->getBreite(), bild->getHeight(), *b);
     b->release();
 }
 
 // Returns a pointer to the image
-Bild* Textur::getBild() const
+Image* Textur::getImage() const
 {
-    return bild ? dynamic_cast<Bild*>(bild->getThis()) : 0;
+    return bild ? dynamic_cast<Image*>(bild->getThis()) : 0;
 }
 
 // Returns a pointer to the image without increased reference counter
-Bild* Textur::zBild() const
+Image* Textur::zImage() const
 {
     return bild;
 }
@@ -208,7 +208,7 @@ void DX11Textur::setUseMips(bool useMips)
 }
 
 //! copy the texture to an image
-void DX11Textur::copyToImage(Bild* zB)
+void DX11Textur::copyToImage(Image* zB)
 {
 #ifdef WIN32
     D3D11_TEXTURE2D_DESC tempBufferDesc;
@@ -226,7 +226,7 @@ void DX11Textur::copyToImage(Bild* zB)
     HRESULT r = device->CreateTexture2D(&tempBufferDesc, 0, &tmpTxt);
     if (r != S_OK) throw "could not create resource copy with cpu read access";
     context->CopyResource(tmpTxt, txt);
-    zB->neuBild(bild->getBreite(), bild->getHeight(), 0);
+    zB->neuImage(bild->getBreite(), bild->getHeight(), 0);
     D3D11_MAPPED_SUBRESOURCE buffer;
     r = context->Map(tmpTxt, 0, D3D11_MAP::D3D11_MAP_READ, 0, &buffer);
     if (r != S_OK) throw "could not access recource copy";

Texture.h

@@ -10,7 +10,7 @@ struct ID3D11DeviceContext;
 
 namespace Framework
 {
-    class Bild;       //! Image.h
+    class Image;       //! Image.h
     class Render3D;   //! Render3D.h
     class TexturList; //! TextureList.h
     class DX12CopyCommandQueue;
@@ -21,7 +21,7 @@ namespace Framework
     class Textur : public virtual ReferenceCounter
     {
     protected:
-        Bild* bild;
+        Image* bild;
         bool changed;
         Punkt lastGr;
         int id;
@@ -33,19 +33,19 @@ namespace Framework
         DLLEXPORT virtual ~Textur();
         //! Sets a pointer to the image that contains the texture
         //! \param b The pointer to the image
-        DLLEXPORT void setBildZ(Bild* b);
+        DLLEXPORT void setImageZ(Image* b);
         //! Sets the image that contains the texture by copying it
         //! \param b The image to copy
-        DLLEXPORT void setBild(Bild* b);
+        DLLEXPORT void setImage(Image* b);
         //! Updates the texture. The pixels of the current image are copied
         //! to graphics memory
         DLLEXPORT virtual bool updateTextur() = 0;
         //! Returns true if updateTextur needs to be called
         DLLEXPORT virtual bool brauchtUpdate() const = 0;
         //! Returns a pointer to the image
-        DLLEXPORT Bild* getBild() const;
+        DLLEXPORT Image* getImage() const;
         //! Returns a pointer to the image without increased reference counter
-        DLLEXPORT Bild* zBild() const;
+        DLLEXPORT Image* zImage() const;
         //! Returns the id of the texture if it was registered in a TexturList.
         //! (see Framework::zTexturRegister())
         DLLEXPORT int getId() const;
@@ -93,6 +93,6 @@ namespace Framework
         //! specifies if a mip map should be generated
         DLLEXPORT void setUseMips(bool useMips);
         //! copy the texture to an image
-        DLLEXPORT void copyToImage(Bild* zB);
+        DLLEXPORT void copyToImage(Image* zB);
     };
 } // namespace Framework

Texture2D.cpp

@@ -38,7 +38,7 @@ void Textur2D::setCircularAnimation(bool ca)
 
 // sets a pointer to the texture (if not animated)
 //  textur: The pointer to the image
-void Textur2D::setTexturZ(Bild* textur)
+void Textur2D::setTexturZ(Image* textur)
 {
     if (txt) txt->release();
     txt = textur;
@@ -99,7 +99,7 @@ bool Textur2D::tick(double t)
         if (a->ausgleich >= 1.0 / a->data->getFPS())
         {
             a->ausgleich -= 1.0 / a->data->getFPS();
-            if (++(a->jetzt) >= a->data->getBildAnzahl())
+            if (++(a->jetzt) >= a->data->getImageAnzahl())
             {
                 a->jetzt = 0;
                 if (!a->data->istWiederhohlend()) nextAnimation();
@@ -112,10 +112,10 @@ bool Textur2D::tick(double t)
 }
 
 // returns the current texture
-Bild* Textur2D::zTextur() const
+Image* Textur2D::zTextur() const
 {
     if (animationIndex != -1)
         return animData->get(animationIndex)
-            ->data->zBild(animData->get(animationIndex)->jetzt);
+            ->data->zImage(animData->get(animationIndex)->jetzt);
     return txt;
 }

Texture2D.h

@@ -4,7 +4,7 @@
 
 namespace Framework
 {
-    class Bild;
+    class Image;
     class Animation2DData;
 
     class Textur2D : public virtual ReferenceCounter
@@ -19,7 +19,7 @@ namespace Framework
 
         bool circularAnimation;
         int animationIndex;
-        Bild* txt;
+        Image* txt;
         Array<Animation*>* animData;
 
     public:
@@ -32,7 +32,7 @@ namespace Framework
         DLLEXPORT void setCircularAnimation(bool ca);
         //! Sets a pointer to the texture (if not animated)
         //! \param textur The pointer to the image
-        DLLEXPORT void setTexturZ(Bild* textur);
+        DLLEXPORT void setTexturZ(Image* textur);
         //! Adds an animation
         //! \param textur The pointer to the animation data
         DLLEXPORT void addAnimationZ(Animation2DData* textur);
@@ -45,6 +45,6 @@ namespace Framework
         //! \param t The elapsed time in seconds
         DLLEXPORT bool tick(double t);
         //! Returns the current texture
-        DLLEXPORT Bild* zTextur() const;
+        DLLEXPORT Image* zTextur() const;
     };
 } // namespace Framework

ToolTip.cpp

@@ -14,7 +14,7 @@ using namespace Framework;
 
 // Contents of the ToolTip class from ToolTip.h
 // Constructor
-ToolTip::ToolTip(Bildschirm* zScreen)
+ToolTip::ToolTip(Screen* zScreen)
     : DrawableBackground(),
       size(0, 0),
       animationSpeed(250),
@@ -61,7 +61,7 @@ void ToolTip::doMausEreignis(MausEreignis& me, bool userRet)
         bool insideParent = me.insideParent;
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         me.mx -= rbr;
         me.my -= rbr;
         if (hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -87,7 +87,7 @@ void ToolTip::doMausEreignis(MausEreignis& me, bool userRet)
     if (sichtbar)
     {
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         me.mx -= rbr;
         me.my -= rbr;
         if (hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -186,9 +186,9 @@ bool ToolTip::tick(double tickVal)
     for (auto z : *members)
     {
         size.x
-            = MAX(size.x, z->getX() + z->getBreite() + 2 * getRahmenBreite());
+            = MAX(size.x, z->getX() + z->getBreite() + 2 * getBorderWidth());
         size.y
-            = MAX(size.y, z->getY() + z->getHeight() + 2 * getRahmenBreite());
+            = MAX(size.y, z->getY() + z->getHeight() + 2 * getBorderWidth());
     }
     this->tval += tickVal * animationSpeed;
     int val = (int)this->tval;
@@ -244,7 +244,7 @@ bool ToolTip::tick(double tickVal)
     return DrawableBackground::tick(tickVal);
 }
 
-void ToolTip::render(Bild& zRObj)
+void ToolTip::render(Image& zRObj)
 {
     if (alpha && (zeichnen || mausIn2))
     {
@@ -259,10 +259,10 @@ void ToolTip::render(Bild& zRObj)
         DrawableBackground::render(zRObj);
         Punkt p = pos;
         Punkt s = gr;
-        if (hatStyle(DrawableBackground::Style::Rahmen))
+        if (hatStyle(DrawableBackground::Style::Border))
         {
-            p += Punkt(getRahmenBreite(), getRahmenBreite());
-            s -= Punkt(getRahmenBreite(), getRahmenBreite()) * 2;
+            p += Punkt(getBorderWidth(), getBorderWidth());
+            s -= Punkt(getBorderWidth(), getBorderWidth()) * 2;
         }
         if (!zRObj.setDrawOptions(p, s))
         {
@@ -283,7 +283,7 @@ void ToolTip::render(Bild& zRObj)
 }
 
 // constant
-Bildschirm* ToolTip::zBildschirm() const
+Screen* ToolTip::zScreen() const
 {
     return bildschirm;
 }

ToolTip.h

@@ -8,13 +8,13 @@
 
 namespace Framework
 {
-    class Schrift;       //! Font.h
-    class Bild;          //! Image.h
+    class Font;       //! Font.h
+    class Image;          //! Image.h
     class AlphaFeld;     //! AlphaField.h
     class Text;          //! Text.h
-    class Rahmen;        //! Border.h
+    class Border;        //! Border.h
     struct MausEreignis; //! MouseEvent.h
-    class Bildschirm;    //! Screen.h
+    class Screen;    //! Screen.h
 
 #ifdef WIN32
 #    pragma vtordisp(push, 2)
@@ -33,7 +33,7 @@ namespace Framework
         bool sichtbar;
         bool zeichnen;
         bool mausIn2;
-        Bildschirm* bildschirm;
+        Screen* bildschirm;
         std::function<void(ToolTip*)> onShow;
         std::function<void(ToolTip*)> onHide;
         //! Processes mouse messages
@@ -42,7 +42,7 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT ToolTip(Bildschirm* zSceen);
+        DLLEXPORT ToolTip(Screen* zSceen);
         //! Destructor
         DLLEXPORT ~ToolTip();
         //! Adds a drawing to the tooltip
@@ -81,10 +81,10 @@ namespace Framework
         DLLEXPORT bool tick(double tickVal) override;
         //! Draws the tip to zRObj if it is visible and the associated
         //! drawing was also drawn \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns a pointer to the screen without increased reference counter
         //! that this tooltip belongs to
-        DLLEXPORT Bildschirm* zBildschirm() const;
+        DLLEXPORT Screen* zScreen() const;
         //! Returns a specific member (without increased reference counter)
         //! \param i The index of the member
         DLLEXPORT Drawable* zMember(int i) const;

UIDialog.cpp

@@ -7,12 +7,12 @@
 
 using namespace Framework;
 
-UIDialog::UIDialog(Schrift* schrift)
-    : Fenster()
+UIDialog::UIDialog(Font* schrift)
+    : Window()
 {
-    addStyle(Fenster::Style::normal | Fenster::Style::BodyHintergrund
-             | Fenster::Style::TitelHintergrund
-             | Fenster::Style::ClosingHintergrund);
+    addStyle(Window::Style::normal | Window::Style::BodyHintergrund
+             | Window::Style::TitelHintergrund
+             | Window::Style::ClosingHintergrund);
     setKBgFarbe(0xFF000000);
     setTBgFarbe(0xFF000000);
     setSBgFarbe(0xFF000000);
@@ -21,11 +21,11 @@ UIDialog::UIDialog(Schrift* schrift)
     setRBreite(1);
     setRFarbe(0xFFFFFFFF);
     setTitel("");
-    setTSchriftZ(schrift);
+    setTFontZ(schrift);
     setTSFarbe(0xFFFFFFFF);
-    zTTextFeld()->setSize(0, 20);
-    zTTextFeld()->addStyle(TextFeld::Style::Sichtbar | TextFeld::Style::Center
-                           | TextFeld::Style::Rahmen);
+    zTTextField()->setSize(0, 20);
+    zTTextField()->addStyle(TextField::Style::Sichtbar | TextField::Style::Center
+                           | TextField::Style::Border);
     setTRFarbe(0xFF00FF00);
     setTRBreite(1);
     setTAfFarbe(0x1000FF00);
@@ -33,7 +33,7 @@ UIDialog::UIDialog(Schrift* schrift)
     setSKAfFarbe(0xFF00FF00);
     setSKAfStrength(30);
     setClosingMe([this](void* p, void* o, MausEreignis me) {
-        if (me.id == ME_RLinks) removeStyle(Fenster::Style::Sichtbar);
+        if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
         return 1;
     });
 }
@@ -53,9 +53,9 @@ void UIDialog::adjustSize()
     }
     setSize(
         max
-        + Punkt(hatStyle(Fenster::Style::Rahmen) ? getRBreite() * 2 : 0,
-            (hatStyle(Fenster::Style::Rahmen) ? getRBreite() * 2 : 0)
-                + (hatStyle(Fenster::Style::Titel) ? zTTextFeld()->getHeight()
+        + Punkt(hatStyle(Window::Style::Border) ? getRBreite() * 2 : 0,
+            (hatStyle(Window::Style::Border) ? getRBreite() * 2 : 0)
+                + (hatStyle(Window::Style::Titel) ? zTTextField()->getHeight()
                                                    : 0)));
 }
 
@@ -63,7 +63,7 @@ void UIDialog::adjustSize()
 //  obj: the drawing
 void UIDialog::addMember(Drawable* obj)
 {
-    Fenster::addMember(obj);
+    Window::addMember(obj);
     adjustSize();
 }
 
@@ -71,28 +71,28 @@ void UIDialog::addMember(Drawable* obj)
 //  zObj: the drawing (without increased reference counter)
 void UIDialog::removeMember(Drawable* zObj)
 {
-    Fenster::removeMember(zObj);
+    Window::removeMember(zObj);
     adjustSize();
 }
 
 // Removes all drawings from the window
 void UIDialog::removeAll()
 {
-    Fenster::removeAll();
+    Window::removeAll();
     adjustSize();
 }
 
 UIMessageDialog::UIMessageDialog(
-    const char* titel, const char* message, Schrift* schrift)
+    const char* titel, const char* message, Font* schrift)
     : UIDialog(schrift)
 {
     setTitel(titel);
     UIInit init = defaultUI(schrift, 0);
-    TextFeld* msg = init.createTextFeld(init.initParam);
-    msg->setStyle(TextFeld::Style::Text);
+    TextField* msg = init.createTextField(init.initParam);
+    msg->setStyle(TextField::Style::Text);
     msg->setText(message);
     msg->setPosition(5, 5);
-    TextRenderer tr(dynamic_cast<Schrift*>(schrift->getThis()));
+    TextRenderer tr(dynamic_cast<Font*>(schrift->getThis()));
     tr.textFormatieren(msg->zText(), 590);
     int br = tr.getTextBreite(message);
     int hoe = tr.getTextHeight(message);
@@ -100,7 +100,7 @@ UIMessageDialog::UIMessageDialog(
     Knopf* ok = init.createKnopf(init.initParam);
     ok->setText("Ok");
     ok->setMausEreignis([this](void* p, void* o, MausEreignis me) {
-        if (me.id == ME_RLinks) removeStyle(Fenster::Style::Sichtbar);
+        if (me.id == ME_RLinks) removeStyle(Window::Style::Sichtbar);
         return 1;
     });
     ok->setPosition(br - 100, hoe + 5);

UIDialog.h

@@ -4,13 +4,13 @@
 
 namespace Framework
 {
-    class UIDialog : public Fenster
+    class UIDialog : public Window
     {
     protected:
         DLLEXPORT void adjustSize();
 
     public:
-        DLLEXPORT UIDialog(Schrift* schrift);
+        DLLEXPORT UIDialog(Font* schrift);
         DLLEXPORT virtual ~UIDialog();
         //! Adds a drawing to the window
         //! \param obj The drawing
@@ -26,7 +26,7 @@ namespace Framework
     {
     public:
         DLLEXPORT UIMessageDialog(
-            const char* titel, const char* message, Schrift* schrift);
+            const char* titel, const char* message, Font* schrift);
         DLLEXPORT virtual ~UIMessageDialog();
     };
 

UIInitialization.cpp

@@ -25,9 +25,9 @@ AuswahlBox* createAuswahlBox(const UIInitParam& p)
     ret->setHintergrundFarbe(0xFF000000);
     ret->setMausEreignis(_ret1ME);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFFFFFFFF);
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     ret->setMaxAuskappHeight(100);
     ret->setMausRahmenBreite(1);
     ret->setMausRahmenFarbe(0xFF005500);
@@ -45,11 +45,11 @@ AuswahlListe* createAuswahlListe(const UIInitParam& p)
     AuswahlListe* ret = new AuswahlListe();
     ret->setStyle(AuswahlListe::Style::Normal);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setAlphaFeldFarbe(0x5500FF00);
     ret->setAlphaFeldStrength(-5);
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFFFFFFFF);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     ret->setHintergrundFarbe(0xFF000000);
     ret->setMausEreignis(_ret1ME);
     ret->setALRBreite(1);
@@ -60,12 +60,12 @@ AuswahlListe* createAuswahlListe(const UIInitParam& p)
     return ret;
 }
 
-BildZ* createBildZ(const UIInitParam& p)
+ImageView* createImageView(const UIInitParam& p)
 {
-    BildZ* ret = new BildZ();
-    ret->setStyle(BildZ::Style::normal);
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFFFFFFFF);
+    ImageView* ret = new ImageView();
+    ret->setStyle(ImageView::Style::normal);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     return ret;
 }
 
@@ -74,21 +74,21 @@ FBalken* createFBalken(const UIInitParam& p)
     FBalken* ret = new FBalken();
     ret->setStyle(FBalken::Style::normal);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSFarbe(0xFFFFFFFF);
     ret->setSSize(12);
-    ret->setRahmenFarbe(0xFFFFFFFF);
-    ret->setRahmenBreite(1);
+    ret->setBorderColor(0xFFFFFFFF);
+    ret->setBorderWidth(1);
 #ifdef WIN32
     LTDBDatei* datei = new LTDBDatei();
     datei->setDatei(new Text(
         "data/bilder/system.ltdb")); // TODO integrate this into the dll
     datei->leseDaten(0);
-    Bild* fbhb = datei->laden(0, new Text("fortschrittleh"));
-    ret->setHintergrundBildZ(fbhb);
-    Bild* fbfhb = datei->laden(0, new Text("fortschrittvol"));
+    Image* fbhb = datei->laden(0, new Text("fortschrittleh"));
+    ret->setHintergrundImageZ(fbhb);
+    Image* fbfhb = datei->laden(0, new Text("fortschrittvol"));
     datei->release();
-    ret->setFBgBildZ(fbfhb);
+    ret->setFBgImageZ(fbfhb);
 #endif
     ret->setFBgFarbe(0xFF00FF00);
     return ret;
@@ -101,22 +101,22 @@ Kamera2D* createKamera2D(const UIInitParam& p)
     return ret;
 }
 
-Fenster* createFenster(const UIInitParam& p)
+Window* createWindow(const UIInitParam& p)
 {
-    Fenster* ret = new Fenster();
+    Window* ret = new Window();
     ret->setMausEreignis(_ret1ME);
     ret->setTastaturEreignis(_ret1TE);
-    ret->setStyle(Fenster::Style::normal);
+    ret->setStyle(Window::Style::normal);
     ret->setRBreite(1);
     ret->setRFarbe(0xFFFFFFFF);
     ret->setTitel("");
     if (p.schrift)
-        ret->setTSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setTFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setTSFarbe(0xFFFFFFFF);
-    ret->zTTextFeld()->setSize(0, 20);
-    ret->zTTextFeld()->addStyle(TextFeld::Style::Sichtbar
-                                | TextFeld::Style::Center
-                                | TextFeld::Style::Rahmen);
+    ret->zTTextField()->setSize(0, 20);
+    ret->zTTextField()->addStyle(TextField::Style::Sichtbar
+                                | TextField::Style::Center
+                                | TextField::Style::Border);
     ret->setTRFarbe(0xFF00FF00);
     ret->setTRBreite(1);
     ret->setTAfFarbe(0x1000FF00);
@@ -130,7 +130,7 @@ Knopf* createKnopf(const UIInitParam& p)
 {
     Knopf* ret = new Knopf();
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setStyle(Knopf::Style::Normal);
     return ret;
 }
@@ -141,13 +141,13 @@ KontrollKnopf* createKontrollKnopf(const UIInitParam& p)
     ret->setMausEreignis(_ret1ME);
     ret->setStyle(KontrollKnopf::Style::Normal);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSFarbe(0xFFFFFFFF);
     ret->setSSize(12);
     ret->setAlphaFeldFarbe(0x5500FF00);
     ret->setAlphaFeldStrength(-5);
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFF00FF00);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFF00FF00);
 #ifdef WIN32
     ret->loadData(
         "data/bilder/system.ltdb"); // TODO integrate this into the dll
@@ -160,9 +160,9 @@ LDiag* createLDiag(const UIInitParam& p)
     LDiag* ret = new LDiag();
     ret->setStyle(LDiag::Style::normal);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFFFFFFFF);
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     ret->setDatenRahmenBreite(1);
     ret->setDatenRahmenFarbe(0xFFFFFFFF);
     ret->setHintergrundFarbe(0xFF000000);
@@ -191,18 +191,18 @@ Animation2D* createAnimation2D(const UIInitParam& p)
     return ret;
 }
 
-TextFeld* createTextFeld(const UIInitParam& p)
+TextField* createTextField(const UIInitParam& p)
 {
-    TextFeld* ret = new TextFeld();
-    ret->setStyle(TextFeld::Style::Text);
+    TextField* ret = new TextField();
+    ret->setStyle(TextField::Style::Text);
     if (p.schrift)
-        ret->setSchriftZ(dynamic_cast<Schrift*>(p.schrift->getThis()));
+        ret->setFontZ(dynamic_cast<Font*>(p.schrift->getThis()));
     ret->setSchriftFarbe(0xFFFFFFFF);
     ret->setSchriftSize(12);
     ret->setAlphaFeldFarbe(0x5500FF00);
     ret->setAlphaFeldStrength(-5);
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFF00FF00);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFF00FF00);
     return ret;
 }
 
@@ -211,8 +211,8 @@ ObjTabelle* createObjTabelle(const UIInitParam& p)
     ObjTabelle* ret = new ObjTabelle();
     ret->setStyle(ObjTabelle::Style::normal);
     ret->setMausEreignis(_ret1ME);
-    ret->setRahmenBreite(1);
-    ret->setRahmenFarbe(0xFFFFFFFF);
+    ret->setBorderWidth(1);
+    ret->setBorderColor(0xFFFFFFFF);
     ret->setRasterBreite(1);
     ret->setRasterFarbe(0xFFFFFFFF);
     ret->setVertikalKlickScroll(5);
@@ -234,25 +234,25 @@ UIMLView* createUIMLView(const UIInitParam& p)
     return ret;
 }
 
-UIInit Framework::defaultUI(Schrift* zSchrift, Bildschirm* zScreen)
+UIInit Framework::defaultUI(Font* zFont, Screen* zScreen)
 {
     UIInit uii;
-    uii.initParam.schrift = zSchrift;
+    uii.initParam.schrift = zFont;
     uii.initParam.bildschirm = zScreen;
     uii.initParam.data = 0;
     uii.createAuswahlBox = createAuswahlBox;
     uii.createAuswahlListe = createAuswahlListe;
-    uii.createBildZ = createBildZ;
+    uii.createImageView = createImageView;
     uii.createFBalken = createFBalken;
     uii.createKamera2D = createKamera2D;
-    uii.createFenster = createFenster;
+    uii.createWindow = createWindow;
     uii.createKnopf = createKnopf;
     uii.createKontrollKnopf = createKontrollKnopf;
     uii.createLDiag = createLDiag;
     uii.createM2DVorschau = createM2DVorschau;
     uii.createModel2D = createModel2D;
     uii.createAnimation2D = createAnimation2D;
-    uii.createTextFeld = createTextFeld;
+    uii.createTextField = createTextField;
     uii.createObjTabelle = createObjTabelle;
     uii.createSLDiag = createSLDiag;
     uii.createUIMLView = createUIMLView;

UIInitialization.h

@@ -8,27 +8,27 @@ namespace Framework
 {
     class AuswahlBox;
     class AuswahlListe;
-    class BildZ;
+    class ImageView;
     class FBalken;
     class Kamera2D;
-    class Fenster;
+    class Window;
     class Knopf;
     class KontrollKnopf;
     class LDiag;
     class M2DVorschau;
     class Model2D;
     class Animation2D;
-    class TextFeld;
+    class TextField;
     class ObjTabelle;
     class SLDiag;
     class UIMLView;
-    class Schrift;
-    class Bildschirm;
+    class Font;
+    class Screen;
 
     struct UIInitParam
     {
-        Schrift* schrift;
-        Bildschirm* bildschirm;
+        Font* schrift;
+        Screen* bildschirm;
         void* data;
     };
 
@@ -37,24 +37,24 @@ namespace Framework
         UIInitParam initParam;
         std::function<AuswahlBox*(const UIInitParam& p)> createAuswahlBox;
         std::function<AuswahlListe*(const UIInitParam& p)> createAuswahlListe;
-        std::function<BildZ*(const UIInitParam& p)> createBildZ;
+        std::function<ImageView*(const UIInitParam& p)> createImageView;
         std::function<FBalken*(const UIInitParam& p)> createFBalken;
         std::function<Kamera2D*(const UIInitParam& p)> createKamera2D;
-        std::function<Fenster*(const UIInitParam& p)> createFenster;
+        std::function<Window*(const UIInitParam& p)> createWindow;
         std::function<Knopf*(const UIInitParam& p)> createKnopf;
         std::function<KontrollKnopf*(const UIInitParam& p)> createKontrollKnopf;
         std::function<LDiag*(const UIInitParam& p)> createLDiag;
         std::function<M2DVorschau*(const UIInitParam& p)> createM2DVorschau;
         std::function<Model2D*(const UIInitParam& p)> createModel2D;
         std::function<Animation2D*(const UIInitParam& p)> createAnimation2D;
-        std::function<TextFeld*(const UIInitParam& p)> createTextFeld;
+        std::function<TextField*(const UIInitParam& p)> createTextField;
         std::function<ObjTabelle*(const UIInitParam& p)> createObjTabelle;
         std::function<SLDiag*(const UIInitParam& p)> createSLDiag;
         std::function<UIMLView*(const UIInitParam& p)> createUIMLView;
     };
 
     //! Returns a list of default initialization functions
-    //! \param zSchrift The font to use (without increased reference counter)
+    //! \param zFont The font to use (without increased reference counter)
     //! \param zScreen The screen to use (without increased reference counter)
-    DLLEXPORT UIInit defaultUI(Schrift* zSchrift, Bildschirm* zScreen);
+    DLLEXPORT UIInit defaultUI(Font* zFont, Screen* zScreen);
 } // namespace Framework

UIMLView.cpp

@@ -261,12 +261,12 @@ void UIMLElement::layout(XML::Element& element,
         if (element.hasAttribute("border"))
         {
             int br = (int)element.getAttributeValue("border");
-            zh->setStyle(DrawableBackground::Style::Rahmen, br > 0);
-            zh->setRahmenBreite((int)element.getAttributeValue("border"));
+            zh->setStyle(DrawableBackground::Style::Border, br > 0);
+            zh->setBorderWidth((int)element.getAttributeValue("border"));
         }
         if (element.hasAttribute("border-color"))
         {
-            zh->setRahmenFarbe((int)element.getAttributeValue("border-color"));
+            zh->setBorderColor((int)element.getAttributeValue("border-color"));
         }
     }
     // recursive layout
@@ -393,7 +393,7 @@ bool UIMLTextField::isApplicableFor(XML::Element& element)
 Drawable* UIMLTextField::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    TextFeld* t = generalFactory.getFactory().createTextFeld(
+    TextField* t = generalFactory.getFactory().createTextField(
         generalFactory.getFactory().initParam);
     t->setText(element.getText());
     updateElement(element, *t, generalFactory);
@@ -403,13 +403,13 @@ Drawable* UIMLTextField::parseElement(
 bool Framework::UIMLTextField::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    TextFeld* t = dynamic_cast<TextFeld*>(&z);
+    TextField* t = dynamic_cast<TextField*>(&z);
     if (!t) return false;
     if (!element.hasAttribute("style"))
     {
-        TextFeld* tmp = generalFactory.getFactory().createTextFeld(
+        TextField* tmp = generalFactory.getFactory().createTextField(
             generalFactory.getFactory().initParam);
-        tmp->addStyle(TextFeld::Style::TextFeld);
+        tmp->addStyle(TextField::Style::TextField);
         t->setStyle(tmp->getStyles());
         tmp->release();
     }
@@ -422,19 +422,19 @@ void UIMLTextField::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    TextFeld* tf = dynamic_cast<TextFeld*>(&z);
+    TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
         tf->setSchriftSize(
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
-    ((TextFeld*)&z)->setText(element.getText());
+    ((TextField*)&z)->setText(element.getText());
     if (element.hasAttribute("width"))
     {
         Text w = element.getAttributeValue("width");
         if (w.istGleich("auto"))
         {
-            z.setWidth(((TextFeld*)&z)->getNeededWidth());
+            z.setWidth(((TextField*)&z)->getNeededWidth());
         }
     }
     if (element.hasAttribute("height"))
@@ -442,7 +442,7 @@ void UIMLTextField::layout(XML::Element& element,
         Text h = element.getAttributeValue("height");
         if (h.istGleich("auto"))
         {
-            z.setHeight(((TextFeld*)&z)->getNeededHeight());
+            z.setHeight(((TextField*)&z)->getNeededHeight());
         }
     }
     if (element.hasAttribute("text-color"))
@@ -451,25 +451,25 @@ void UIMLTextField::layout(XML::Element& element,
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
-        z.setStyle(TextFeld::Style::HCenter,
+        z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
                 .istGleich("center"));
     if (element.hasAttribute("text-align-vertical"))
-        z.setStyle(TextFeld::Style::VCenter,
+        z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
                 .istGleich("center"));
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextFeld::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editierbar);
     if (element.getAttributeValue("vScroll").istGleich("auto"))
     {
-        tf->setStyle(TextFeld::Style::VScroll,
+        tf->setStyle(TextField::Style::VScroll,
             tf->getNeededHeight() > tf->getInnenHeight());
         tf->setVertikalKlickScroll(tf->getSchriftSize());
         tf->updateVScroll();
     }
     if (element.getAttributeValue("hScroll").istGleich("auto"))
     {
-        tf->setStyle(TextFeld::Style::HScroll,
+        tf->setStyle(TextField::Style::HScroll,
             tf->getNeededWidth() > tf->getInnenBreite());
         tf->setHorizontalKlickScroll(tf->getSchriftSize());
         tf->updateHScroll();
@@ -585,7 +585,7 @@ bool UIMLText::isApplicableFor(XML::Element& element)
 Drawable* UIMLText::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    TextFeld* t = generalFactory.getFactory().createTextFeld(
+    TextField* t = generalFactory.getFactory().createTextField(
         generalFactory.getFactory().initParam);
     t->setText(element.getText());
     updateElement(element, *t, generalFactory);
@@ -595,13 +595,13 @@ Drawable* UIMLText::parseElement(
 bool Framework::UIMLText::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    TextFeld* t = dynamic_cast<TextFeld*>(&z);
+    TextField* t = dynamic_cast<TextField*>(&z);
     if (!t) return false;
     if (!element.hasAttribute("style"))
     {
-        TextFeld* tmp = generalFactory.getFactory().createTextFeld(
+        TextField* tmp = generalFactory.getFactory().createTextField(
             generalFactory.getFactory().initParam);
-        tmp->addStyle(TextFeld::Style::Text);
+        tmp->addStyle(TextField::Style::Text);
         t->setStyle(tmp->getStyles());
         tmp->release();
     }
@@ -614,7 +614,7 @@ void UIMLText::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    TextFeld* tf = dynamic_cast<TextFeld*>(&z);
+    TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
         tf->setSchriftSize(
@@ -643,25 +643,25 @@ void UIMLText::layout(XML::Element& element,
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
-        z.setStyle(TextFeld::Style::HCenter,
+        z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
                 .istGleich("center"));
     if (element.hasAttribute("text-align-vertical"))
-        z.setStyle(TextFeld::Style::VCenter,
+        z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
                 .istGleich("center"));
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextFeld::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editierbar);
     if (element.getAttributeValue("vScroll").istGleich("auto"))
     {
-        tf->setStyle(TextFeld::Style::VScroll,
+        tf->setStyle(TextField::Style::VScroll,
             tf->getNeededHeight() > tf->getInnenHeight());
         tf->setVertikalKlickScroll(tf->getSchriftSize());
         tf->updateVScroll();
     }
     if (element.getAttributeValue("hScroll").istGleich("auto"))
     {
-        tf->setStyle(TextFeld::Style::HScroll,
+        tf->setStyle(TextField::Style::HScroll,
             tf->getNeededWidth() > tf->getInnenBreite());
         tf->setHorizontalKlickScroll(tf->getSchriftSize());
         tf->updateHScroll();
@@ -680,7 +680,7 @@ bool UIMLTextArea::isApplicableFor(XML::Element& element)
 Drawable* UIMLTextArea::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    TextFeld* t = generalFactory.getFactory().createTextFeld(
+    TextField* t = generalFactory.getFactory().createTextField(
         generalFactory.getFactory().initParam);
     t->setText(element.getText());
     updateElement(element, *t, generalFactory);
@@ -690,13 +690,13 @@ Drawable* UIMLTextArea::parseElement(
 bool Framework::UIMLTextArea::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    TextFeld* t = dynamic_cast<TextFeld*>(&z);
+    TextField* t = dynamic_cast<TextField*>(&z);
     if (!t) return false;
     if (!element.hasAttribute("style"))
     {
-        TextFeld* tmp = generalFactory.getFactory().createTextFeld(
+        TextField* tmp = generalFactory.getFactory().createTextField(
             generalFactory.getFactory().initParam);
-        tmp->addStyle(TextFeld::Style::TextGebiet);
+        tmp->addStyle(TextField::Style::TextGebiet);
         t->setStyle(tmp->getStyles());
         tmp->release();
     }
@@ -709,14 +709,14 @@ void UIMLTextArea::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    TextFeld* tf = dynamic_cast<TextFeld*>(&z);
+    TextField* tf = dynamic_cast<TextField*>(&z);
     if (element.hasAttribute("font-size"))
     {
         tf->setSchriftSize(
             (unsigned char)(int)element.getAttributeValue("font-size"));
     }
     if (element.hasAttribute("disabled"))
-        z.removeStyle(TextFeld::Style::Editierbar);
+        z.removeStyle(TextField::Style::Editierbar);
     tf->setText(element.getText());
     tf->zTextRenderer()->textFormatieren(tf->zText(), z.getInnenBreite());
     if (element.hasAttribute("width"))
@@ -724,7 +724,7 @@ void UIMLTextArea::layout(XML::Element& element,
         Text w = element.getAttributeValue("width");
         if (w.istGleich("auto"))
         {
-            z.setWidth(((TextFeld*)&z)->getNeededWidth());
+            z.setWidth(((TextField*)&z)->getNeededWidth());
         }
     }
     if (element.hasAttribute("height"))
@@ -732,7 +732,7 @@ void UIMLTextArea::layout(XML::Element& element,
         Text h = element.getAttributeValue("height");
         if (h.istGleich("auto"))
         {
-            z.setHeight(((TextFeld*)&z)->getNeededHeight());
+            z.setHeight(((TextField*)&z)->getNeededHeight());
         }
     }
     if (element.hasAttribute("text-color"))
@@ -741,24 +741,24 @@ void UIMLTextArea::layout(XML::Element& element,
     }
     UIMLElement::layout(element, z, pWidth, pHeight, generalLayouter);
     if (element.hasAttribute("text-align-horizontal"))
-        z.setStyle(TextFeld::Style::HCenter,
+        z.setStyle(TextField::Style::HCenter,
             element.getAttributeValue("text-align-horizontal")
                 .istGleich("center"));
     if (element.hasAttribute("text-align-vertical"))
-        z.setStyle(TextFeld::Style::VCenter,
+        z.setStyle(TextField::Style::VCenter,
             element.getAttributeValue("text-align-vertical")
                 .istGleich("center"));
     if (element.hasAttribute("font-size"))
         if (element.getAttributeValue("vScroll").istGleich("auto"))
         {
-            tf->setStyle(TextFeld::Style::VScroll,
+            tf->setStyle(TextField::Style::VScroll,
                 tf->getNeededHeight() > tf->getInnenHeight());
             tf->setVertikalKlickScroll(tf->getSchriftSize());
             tf->updateVScroll();
         }
     if (element.getAttributeValue("hScroll").istGleich("auto"))
     {
-        tf->setStyle(TextFeld::Style::HScroll,
+        tf->setStyle(TextField::Style::HScroll,
             tf->getNeededWidth() > tf->getInnenBreite());
         tf->setHorizontalKlickScroll(tf->getSchriftSize());
         tf->updateHScroll();
@@ -906,7 +906,7 @@ bool UIMLFrame::isApplicableFor(XML::Element& element)
 Drawable* UIMLFrame::parseElement(
     XML::Element& element, UIMLContainer& generalFactory)
 {
-    Fenster* f = generalFactory.getFactory().createFenster(
+    Window* f = generalFactory.getFactory().createWindow(
         generalFactory.getFactory().initParam);
     updateElement(element, *f, generalFactory);
     return f;
@@ -915,7 +915,7 @@ Drawable* UIMLFrame::parseElement(
 bool Framework::UIMLFrame::updateElement(
     XML::Element& element, Drawable& z, UIMLContainer& generalFactory)
 {
-    Fenster* f = dynamic_cast<Fenster*>(&z);
+    Window* f = dynamic_cast<Window*>(&z);
     if (!f) return false;
     for (auto member = f->getMembers().begin(); member;)
     { // remove all members that are not in the xml
@@ -950,7 +950,7 @@ bool Framework::UIMLFrame::updateElement(
     }
     if (!element.hasAttribute("style"))
     {
-        Fenster* tmp = generalFactory.getFactory().createFenster(
+        Window* tmp = generalFactory.getFactory().createWindow(
             generalFactory.getFactory().initParam);
         f->setStyle(tmp->getStyles());
         tmp->release();
@@ -964,22 +964,22 @@ void UIMLFrame::layout(XML::Element& element,
     int pHeight,
     UIMLContainer& generalLayouter)
 {
-    Fenster* f = dynamic_cast<Fenster*>(&z);
+    Window* f = dynamic_cast<Window*>(&z);
     if (element.hasAttribute("title"))
         f->setTitel(element.getAttributeValue("title"));
     if (element.hasAttribute("title-height"))
     {
-        f->zTTextFeld()->setSize(f->zTTextFeld()->getBreite(),
+        f->zTTextField()->setSize(f->zTTextField()->getBreite(),
             (int)element.getAttributeValue("title-height"));
     }
     if (element.hasAttribute("title-font-size"))
     {
-        f->zTTextFeld()->setSchriftSize(
+        f->zTTextField()->setSchriftSize(
             (unsigned char)(int)element.getAttributeValue("title-font-size"));
     }
     if (element.hasAttribute("title-text-color"))
     {
-        f->zTTextFeld()->setSchriftFarbe(
+        f->zTTextField()->setSchriftFarbe(
             (int)element.getAttributeValue("title-text-color"));
     }
     if (element.hasAttribute("width"))
@@ -1057,14 +1057,14 @@ void UIMLFrame::layout(XML::Element& element,
         generalLayouter); // calculate all remaining positions
     if (element.getAttributeValue("vScroll").istGleich("auto"))
     {
-        f->setStyle(Fenster::Style::VScroll,
+        f->setStyle(Window::Style::VScroll,
             f->getNeededChildHeight() > f->getInnenHeight());
         f->setVSBScroll(10);
         f->updateVScroll();
     }
     if (element.getAttributeValue("hScroll").istGleich("auto"))
     {
-        f->setStyle(Fenster::Style::HScroll,
+        f->setStyle(Window::Style::HScroll,
             f->getNeededChildWidth() > f->getInnenBreite());
         f->setHSBScroll(10);
         f->updateHScroll();
@@ -1128,7 +1128,7 @@ void UIMLView::doMausEreignis(MausEreignis& me, bool userRet)
             || !userRet)
             me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         me.mx -= rbr;
         me.my -= rbr;
         if (hatStyle(Style::VScroll) && vertikalScrollBar)
@@ -1319,7 +1319,7 @@ Text UIMLView::addMember(Text uiml, Text parentId)
                 Drawable* z = parseElement(*e, *this);
                 if (z)
                 {
-                    dynamic_cast<Fenster*>(
+                    dynamic_cast<Window*>(
                         members->z(parentId, parentId.getLength()))
                         ->addMember(z);
                     ed2.begin()->addChild(e);
@@ -1379,17 +1379,17 @@ bool UIMLView::tick(double tickVal)
 }
 
 // Draws the background of a drawing to rObj
-void UIMLView::render(Bild& rObj)
+void UIMLView::render(Image& rObj)
 {
     if (hatStyle(Drawable::Style::Sichtbar))
     {
         DrawableBackground::render(rObj);
         if (dom)
         {
-            if (!rObj.setDrawOptions(pos.x + getRahmenBreite(),
-                    pos.y + getRahmenBreite(),
-                    gr.x + getRahmenBreite() * 2,
-                    gr.y + getRahmenBreite() * 2))
+            if (!rObj.setDrawOptions(pos.x + getBorderWidth(),
+                    pos.y + getBorderWidth(),
+                    gr.x + getBorderWidth() * 2,
+                    gr.y + getBorderWidth() * 2))
                 return;
             bool vSc = hatStyle(Style::VScroll) && vertikalScrollBar;
             bool hSc = hatStyle(Style::HScroll) && horizontalScrollBar;
@@ -1650,7 +1650,7 @@ Punkt UIMLView::calculateContentSize()
             maxP.y = MAX(maxP.y, z->getPosition().y + z->getHeight());
         }
     }
-    maxP.x += 2 * getRahmenBreite();
-    maxP.y += 2 * getRahmenBreite();
+    maxP.x += 2 * getBorderWidth();
+    maxP.y += 2 * getBorderWidth();
     return maxP;
 }

UIMLView.h

@@ -10,8 +10,8 @@ namespace Framework
 {
     class Text;
     class ObjTabelle;
-    class Schrift;
-    class Bildschirm;
+    class Font;
+    class Screen;
     class UIMLContainer;
 
     /**
@@ -24,12 +24,12 @@ namespace Framework
           + 0x...: will be interpreted as hex
           # ...: will be interpreted as normal __int64
         - (string) text-align-horizontal:
-          + center: adds the style TextFeld::Style::HCenter
+          + center: adds the style TextField::Style::HCenter
         - (string) text-align-vertical:
-          + center: adds the style TextFeld::Style::VCenter
+          + center: adds the style TextField::Style::VCenter
         - (int) font-size: sets the font size
         - (int) text-color: sets the text color format: 0xAARRGGBB
-        - disabled: removes the style TextFeld::Style::Editierbar
+        - disabled: removes the style TextField::Style::Editierbar
         - (string) width: sets the with
           + (int)%: specifies the width in % of the parent element
           + (int): specifies the width in pixel
@@ -190,19 +190,19 @@ namespace Framework
     };
 
     /**
-      creates a TextFeld instance with style TextField::Style::TextField
+      creates a TextField instance with style TextField::Style::TextField
 
       tag: <textfield>
 
       additional attributes to UIMLElement:
         - (__int64) style: sets the style. Default: TextField::Style::TextField
         - (string) text-align-horizontal:
-          + center: adds the style TextFeld::Style::HCenter
+          + center: adds the style TextField::Style::HCenter
         - (string) text-align-vertical:
-          + center: adds the style TextFeld::Style::VCenter
+          + center: adds the style TextField::Style::VCenter
         - (int) font-size: sets the font size
         - (int) text-color: sets the text color. format: 0xAARRGGBB
-        - disabled: removes the style TextFeld::Style::Editierbar
+        - disabled: removes the style TextField::Style::Editierbar
         - (string) width: sets the with
           + auto: setzt the width to the calculated needed width
         - (string) height: sets the height
@@ -266,19 +266,19 @@ namespace Framework
     };
 
     /**
-      creates a TextFeld instance with style TextField::Style::Text
+      creates a TextField instance with style TextField::Style::Text
 
       tag: <text>
 
       additional attributes to UIMLElement:
         - (__int64) style: sets the style. Default: TextField::Style::Text
         - (string) text-align-horizontal:
-          + center: adds the style TextFeld::Style::HCenter
+          + center: adds the style TextField::Style::HCenter
         - (string) text-align-vertical:
-          + center: adds the style TextFeld::Style::VCenter
+          + center: adds the style TextField::Style::VCenter
         - (int) font-size: sets the font size
         - (int) text-color: sets the text color. format: 0xAARRGGBB
-        - disabled: removes the style TextFeld::Style::Editierbar
+        - disabled: removes the style TextField::Style::Editierbar
         - (string) width: sets the with
           + auto: setzt the width to the calculated needed width
         - (string) height: sets the height
@@ -308,19 +308,19 @@ namespace Framework
     };
 
     /**
-      creates a TextFeld instance with style TextField::Style::TextGebiet
+      creates a TextField instance with style TextField::Style::TextGebiet
 
       tag: <textarea>
 
       additional attributes to UIMLElement:
         - (__int64) style: sets the style. Default: TextField::Style::TextGebiet
         - (string) text-align-horizontal:
-          + center: adds the style TextFeld::Style::HCenter
+          + center: adds the style TextField::Style::HCenter
         - (string) text-align-vertical:
-          + center: adds the style TextFeld::Style::VCenter
+          + center: adds the style TextField::Style::VCenter
         - (int) font-size: sets the font size
         - (int) text-color: sets the text color. format: 0xAARRGGBB
-        - disabled: removes the style TextFeld::Style::Editierbar
+        - disabled: removes the style TextField::Style::Editierbar
         - (string) width: sets the with
           + auto: setzt the width to the calculated needed width
         - (string) height: sets the height
@@ -368,7 +368,7 @@ namespace Framework
     };
 
     /**
-      creates a Fenster instance
+      creates a Window instance
 
       tag: <frame>
 
@@ -561,7 +561,7 @@ namespace Framework
         //! of this function \return 1 if the image needs to be redrawn. 0 otherwise
         DLLEXPORT bool tick(double tickVal) override;
         //! Renders the background of a drawing to rObj
-        DLLEXPORT void render(Bild& rObj) override;
+        DLLEXPORT void render(Image& rObj) override;
         //! Returns the DOM tree without increased reference counter
         //! Changes to the DOM tree should be avoided (only changes to
         //! attributes of individual elements are allowed)

Window.cpp

@@ -1,13 +1,13 @@
 #include "Window.h"
 
 #include "AlphaField.h"
-#include "Image.h"
-#include "Screen.h"
+#include "Border.h"
 #include "Globals.h"
+#include "Image.h"
+#include "KeyboardEvent.h"
 #include "MouseEvent.h"
-#include "Border.h"
+#include "Screen.h"
 #include "Scroll.h"
-#include "KeyboardEvent.h"
 #include "Text.h"
 #include "TextField.h"
 #include "ToolTip.h"
@@ -68,13 +68,13 @@ LRESULT CALLBACK Framework::WindowProc(
         MausZeiger.update();
         return 0;
     case WM_SIZE: // Window
-        if (wparam == SIZE_RESTORED) WFensterA.sendRestoreMessage(hwnd);
+        if (wparam == SIZE_RESTORED) nativeWindows.sendRestoreMessage(hwnd);
         break;
     case WM_CLOSE: // Close
-        if (WFensterA.sendVSchliessMessage(hwnd)) return 0;
+        if (nativeWindows.sendVSchliessMessage(hwnd)) return 0;
         break;
     case WM_DESTROY:
-        if (WFensterA.sendNSchliessMessage(hwnd)) return 0;
+        if (nativeWindows.sendNSchliessMessage(hwnd)) return 0;
         break;           // Mouse
     case WM_LBUTTONDOWN: // Left click
         {
@@ -86,7 +86,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONDOWN: // Right click
@@ -99,7 +99,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONDOWN: // Middle click
@@ -112,7 +112,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_LBUTTONUP: // Left release
@@ -125,7 +125,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONUP: // Right release
@@ -138,7 +138,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONUP: // Middle release
@@ -151,7 +151,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_LBUTTONDBLCLK: // Left double click
@@ -163,7 +163,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_RBUTTONDBLCLK: // Right double click
@@ -175,7 +175,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MBUTTONDBLCLK: // Middle double click
@@ -187,7 +187,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MOUSEHOVER: // Mouse enters window
@@ -200,7 +200,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MOUSELEAVE: // Mouse leaves window
@@ -213,7 +213,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MOUSEMOVE: // Mouse is moving
@@ -235,7 +235,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 1,
                 (int)LOWORD(lparam),
                 (int)HIWORD(lparam)};
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
     case WM_MOUSEWHEEL: // Mouse scroll
@@ -250,7 +250,7 @@ LRESULT CALLBACK Framework::WindowProc(
                 me.id = !getTastenStand(T_Shift) ? ME_DScroll : ME_RScroll;
             else
                 me.id = !getTastenStand(T_Shift) ? ME_UScroll : ME_LScroll;
-            WFensterA.sendMausMessage(hwnd, me);
+            nativeWindows.sendMausMessage(hwnd, me);
             break;
         }
         // Keyboard
@@ -261,7 +261,7 @@ LRESULT CALLBACK Framework::WindowProc(
                  0, 0
             };
             CalculateEnteredString((int)wparam, 0, te);
-            WFensterA.sendTastaturMessage(hwnd, te);
+            nativeWindows.sendTastaturMessage(hwnd, te);
             return 0;
         } // Key is pressed
     case WM_KEYUP:
@@ -271,7 +271,7 @@ LRESULT CALLBACK Framework::WindowProc(
                  0, 0
             };
             CalculateEnteredString((int)wparam, HIWORD(lparam) & 0xFF, te);
-            WFensterA.sendTastaturMessage(hwnd, te);
+            nativeWindows.sendTastaturMessage(hwnd, te);
             return 0;
         } // Key is released
     }
@@ -320,9 +320,9 @@ void Framework::CalculateEnteredString(
 #    endif // WIN32
 }
 
-// Contents of the WFenster class from Window.h
+// Contents of the NativeWindow class from Window.h
 // Constructor
-WFenster::WFenster()
+NativeWindow::NativeWindow()
     : ReferenceCounter(),
       hWnd(0),
       style(0),
@@ -341,28 +341,29 @@ WFenster::WFenster()
       bitmap(0),
       hdc(0)
 {
-    WFensterA.addFenster(this);
+    nativeWindows.addWindow(this);
 }
 
-WFenster::WFenster(HWND hwnd)
-    : WFenster()
+NativeWindow::NativeWindow(HWND hwnd)
+    : NativeWindow()
 {
     hWnd = hwnd;
 }
 
 // Destructor
-WFenster::~WFenster()
+NativeWindow::~NativeWindow()
 {
-    if (WFensterA.removeFenster(this))
+    if (nativeWindows.removeWindow(this))
     {
-        WFensterA.del();
+        nativeWindows.del();
     }
     if (hWnd) zerstoeren();
     if (screen) screen->release();
 }
 
 // non-constant
-void WFenster::erstellen(int style, WNDCLASS wc) // Creates a window in Windows
+void NativeWindow::erstellen(
+    int style, WNDCLASS wc) // Creates a window in Windows
 {
     if (!GetClassInfo(wc.hInstance, wc.lpszClassName, &wc))
     {
@@ -370,7 +371,7 @@ void WFenster::erstellen(int style, WNDCLASS wc) // Creates a window in Windows
         if (!RegisterClass(&wc)) // Register window class
         {
             MessageBox(hWnd,
-                "Fehler beim Registrieren der Fensterklasse!",
+                "Fehler beim Registrieren der WindowClass!",
                 "Error",
                 MB_ICONERROR); // Error message on failure
             return;
@@ -392,7 +393,7 @@ void WFenster::erstellen(int style, WNDCLASS wc) // Creates a window in Windows
     if (hWnd == 0)
     {
         MessageBox(hWnd,
-            "Fehler beim erstellen des Fensters!",
+            "Fehler beim erstellen des Windows!",
             "Error",
             MB_ICONERROR); // Error message on failure
         return;
@@ -400,7 +401,7 @@ void WFenster::erstellen(int style, WNDCLASS wc) // Creates a window in Windows
     this->style = style;
 }
 
-void WFenster::erstellenEx(
+void NativeWindow::erstellenEx(
     int exStyle, int style, WNDCLASSEX wc) // Create the window
 {
     if (!GetClassInfoEx(wc.hInstance, wc.lpszClassName, &wc))
@@ -409,7 +410,7 @@ void WFenster::erstellenEx(
         if (!RegisterClassEx(&wc)) // Register window class
         {
             MessageBox(hWnd,
-                "Fehler beim Registrieren der Fensterklasse!",
+                "Fehler beim Registrieren der WindowClass!",
                 "Error",
                 MB_ICONERROR); // Error message on failure
             return;
@@ -432,7 +433,7 @@ void WFenster::erstellenEx(
     if (hWnd == 0)
     {
         MessageBox(hWnd,
-            "Fehler beim erstellen des Fensters!",
+            "Fehler beim erstellen des Windows!",
             "Error",
             MB_ICONERROR); // Error message on failure
         return;
@@ -440,7 +441,7 @@ void WFenster::erstellenEx(
     this->style = style;
 }
 
-void WFenster::setAnzeigeModus(int mod) // Display window
+void NativeWindow::setAnzeigeModus(int mod) // Display window
 {
     if (rahmen)
     {
@@ -452,7 +453,7 @@ void WFenster::setAnzeigeModus(int mod) // Display window
     ShowWindow(hWnd, mod);
 }
 
-bool WFenster::setFokus() // Sets the focus on the window
+bool NativeWindow::setFokus() // Sets the focus on the window
 {
     DWORD dwCurrentThread = GetCurrentThreadId();
     DWORD dwFGThread = GetWindowThreadProcessId(GetForegroundWindow(), NULL);
@@ -476,12 +477,12 @@ bool WFenster::setFokus() // Sets the focus on the window
     return GetFocus() == hWnd;
 }
 
-void WFenster::setPosition(const Punkt& p) // Window position
+void NativeWindow::setPosition(const Punkt& p) // Window position
 {
     setPosition(p.x, p.y);
 }
 
-void WFenster::setPosition(int x, int y)
+void NativeWindow::setPosition(int x, int y)
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find previous position
@@ -498,7 +499,7 @@ void WFenster::setPosition(int x, int y)
         0); // Change position
 }
 
-void WFenster::setSize(Punkt& g) // Window size
+void NativeWindow::setSize(Punkt& g) // Window size
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find previous size
@@ -509,7 +510,7 @@ void WFenster::setSize(Punkt& g) // Window size
         hWnd, 0, res.left, res.top, res.right, res.bottom, 0); // Change size
 }
 
-void WFenster::setSize(int breite, int hoehe)
+void NativeWindow::setSize(int breite, int hoehe)
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find previous size
@@ -520,19 +521,19 @@ void WFenster::setSize(int breite, int hoehe)
         hWnd, 0, res.left, res.top, res.right, res.bottom, 0); // Change size
 }
 
-void WFenster::setBounds(
+void NativeWindow::setBounds(
     const Punkt& p, const Punkt& g) // sets size and position
 {
     SetWindowPos(hWnd, 0, p.x, p.y, g.x, g.y, 0); // Change size and position
 }
 
-void WFenster::setBildschirm(Bildschirm* screen)
+void NativeWindow::setScreen(Screen* screen)
 {
     if (this->screen) this->screen->release();
     this->screen = screen;
 }
 
-void WFenster::zerstoeren()
+void NativeWindow::zerstoeren()
 {
     DestroyWindow(hWnd);
     hWnd = 0;
@@ -544,7 +545,7 @@ void WFenster::zerstoeren()
     hdc = 0;
 }
 
-void WFenster::doMausAktion(MausEreignis& me)
+void NativeWindow::doMausAktion(MausEreignis& me)
 {
     if (!mausAktion || !mausAktion(makParam, this, me)) return;
     if (screen && me.id != ME_Betritt && me.id != ME_Leaves)
@@ -590,84 +591,86 @@ void WFenster::doMausAktion(MausEreignis& me)
     }
 }
 
-void WFenster::doVSchliessAktion()
+void NativeWindow::doVSchliessAktion()
 {
     if (!vCloseAktion) return;
     vCloseAktion(sakParam, this);
 }
 
-void WFenster::doNSchliessAktion()
+void NativeWindow::doNSchliessAktion()
 {
     if (!nCloseAktion) return;
     nCloseAktion(sakParam, this);
 }
 
-void WFenster::doTastaturAktion(TastaturEreignis& te)
+void NativeWindow::doTastaturAktion(TastaturEreignis& te)
 {
     if (!tastaturAktion || !tastaturAktion(takParam, this, te)) return;
     if (screen) screen->doTastaturEreignis(te);
 }
 
-void WFenster::doRestoreMessage() // makes the border visible
+void NativeWindow::doRestoreMessage() // makes the border visible
 {
     if (rahmen) ShowWindow(rahmen, 1);
     ShowWindow(hWnd, 1);
 }
 
-void WFenster::setMausEreignisParameter(
+void NativeWindow::setMausEreignisParameter(
     void* p) // sets the mouse event parameter
 {
     makParam = p;
 }
 
-void WFenster::setSchliessEreignisParameter(
+void NativeWindow::setSchliessEreignisParameter(
     void* p) // sets the close event parameter
 {
     sakParam = p;
 }
 
-void WFenster::setTastaturEreignisParameter(
+void NativeWindow::setTastaturEreignisParameter(
     void* p) // sets the keyboard event parameter
 {
     takParam = p;
 }
 
-void WFenster::setMausAktion(MausAktion mausAk)
+void NativeWindow::setMausAktion(MausAktion mausAk)
 {
     mausAktion = mausAk;
 }
 
-void WFenster::setVSchliessAktion(std::function<void(void*, void*)> vSchliessAk)
+void NativeWindow::setVSchliessAktion(
+    std::function<void(void*, void*)> vSchliessAk)
 {
     vCloseAktion = vSchliessAk;
 }
 
-void WFenster::setNSchliessAktion(std::function<void(void*, void*)> nSchliessAk)
+void NativeWindow::setNSchliessAktion(
+    std::function<void(void*, void*)> nSchliessAk)
 {
     nCloseAktion = nSchliessAk;
 }
 
-void WFenster::setTastaturAktion(TastaturAktion tastaturAk)
+void NativeWindow::setTastaturAktion(TastaturAktion tastaturAk)
 {
     tastaturAktion = tastaturAk;
 }
 
-void WFenster::setFensterHandle(HWND hWnd) // sets the operation window
+void NativeWindow::setWindowHandle(HWND hWnd) // sets the operation window
 {
     this->hWnd = hWnd;
 }
 
-void WFenster::setVerschiebbar(
+void NativeWindow::setVerschiebbar(
     bool verschiebbar) // determines whether the window can be
                        // moved by dragging with the mouse
 {
     this->verschiebbar = verschiebbar;
 }
 
-void WFenster::ladeRahmenFenster(Bild* zBild,
+void NativeWindow::loadBorderWindow(Image* zImage,
     HINSTANCE hinst) // sets a transparent border around the window
 {
-    if (!zBild) return;
+    if (!zImage) return;
     // Create window
     WNDCLASSEX wcl = {0};
     wcl.cbSize = sizeof(wcl);
@@ -689,8 +692,8 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
     BITMAPINFO info;
     info.bmiHeader.biSize = sizeof(info.bmiHeader);
     info.bmiHeader.biBitCount = 32;
-    info.bmiHeader.biWidth = zBild->getBreite();
-    info.bmiHeader.biHeight = -zBild->getHeight();
+    info.bmiHeader.biWidth = zImage->getBreite();
+    info.bmiHeader.biHeight = -zImage->getHeight();
     info.bmiHeader.biCompression = BI_RGB;
     info.bmiHeader.biPlanes = 1;
     unsigned char* pPixels = 0;
@@ -699,33 +702,34 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
     if (!bitmap) DeleteDC(hdc);
     GdiFlush();
     // Fill bitmap
-    int pitch = ((zBild->getBreite() * 32 + 31) & ~31) >> 3;
+    int pitch = ((zImage->getBreite() * 32 + 31) & ~31) >> 3;
     unsigned char* pRow = 0;
-    int* buffer = zBild->getBuffer();
-    for (int i = 0; i < zBild->getHeight(); ++i)
+    int* buffer = zImage->getBuffer();
+    for (int i = 0; i < zImage->getHeight(); ++i)
     {
         pRow = &pPixels[i * pitch];
-        for (int i2 = 0; i2 < zBild->getBreite(); ++i2)
+        for (int i2 = 0; i2 < zImage->getBreite(); ++i2)
         {
             pRow[i2 * 4]
-                = (unsigned char)((buffer[i2 + i * zBild->getBreite()] >> 16)
+                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 16)
                                   & 0xFF);
             pRow[i2 * 4 + 1]
-                = (unsigned char)((buffer[i2 + i * zBild->getBreite()] >> 8)
+                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 8)
                                   & 0xFF);
             pRow[i2 * 4 + 2]
-                = (unsigned char)((buffer[i2 + i * zBild->getBreite()]) & 0xFF);
+                = (unsigned char)((buffer[i2 + i * zImage->getBreite()])
+                                  & 0xFF);
             pRow[i2 * 4 + 3]
-                = (unsigned char)((buffer[i2 + i * zBild->getBreite()] >> 24)
+                = (unsigned char)((buffer[i2 + i * zImage->getBreite()] >> 24)
                                   & 0xFF);
         }
     }
     // Calculate alpha
     unsigned char* pPixel = 0;
-    if (zBild->getBreite() * 4 == pitch)
+    if (zImage->getBreite() * 4 == pitch)
     {
         int i = 0;
-        int totalBytes = zBild->getBreite() * zBild->getHeight() * 4;
+        int totalBytes = zImage->getBreite() * zImage->getHeight() * 4;
 
         for (i = 0; i < totalBytes; i += 4)
         {
@@ -740,9 +744,9 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
         int x = 0;
         int y = 0;
 
-        for (y = 0; y < zBild->getHeight(); ++y)
+        for (y = 0; y < zImage->getHeight(); ++y)
         {
-            for (x = 0; x < zBild->getBreite(); ++x)
+            for (x = 0; x < zImage->getBreite(); ++x)
             {
                 pPixel = &pPixels[(y * pitch) + (x * 4)];
                 pPixel[0] *= (unsigned char)((float)pPixel[3] / 255.0f);
@@ -756,12 +760,12 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
     {
         rahmen = CreateWindowEx(WS_EX_TOOLWINDOW | WS_EX_LAYERED,
             wcl.lpszClassName,
-            TEXT("Transparentes Fenster"),
+            TEXT("Transparentes Window"),
             WS_POPUP,
             0,
             0,
-            zBild->getBreite(),
-            zBild->getHeight(),
+            zImage->getBreite(),
+            zImage->getHeight(),
             0,
             0,
             wcl.hInstance,
@@ -775,7 +779,7 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
                 HGDIOBJ hPrevObj = NULL;
                 POINT ptDest = {0, 0};
                 POINT ptSrc = {0, 0};
-                SIZE client = {zBild->getBreite(), zBild->getHeight()};
+                SIZE client = {zImage->getBreite(), zImage->getHeight()};
                 BLENDFUNCTION blendFunc = {AC_SRC_OVER, 0, 255, AC_SRC_ALPHA};
 
                 hPrevObj = SelectObject(hdc, bitmap);
@@ -795,111 +799,111 @@ void WFenster::ladeRahmenFenster(Bild* zBild,
                 ReleaseDC(rahmen, h);
             }
             UpdateWindow(rahmen);
-            Punkt pos = getPosition() + (getGroesse() - zBild->getSize()) / 2;
+            Punkt pos = getPosition() + (getGroesse() - zImage->getSize()) / 2;
             SetWindowPos(rahmen,
                 0,
                 pos.x,
                 pos.y,
-                zBild->getBreite(),
-                zBild->getHeight(),
+                zImage->getBreite(),
+                zImage->getHeight(),
                 0);
         }
     }
 }
 
 // constant
-Punkt WFenster::getPosition() const // returns the position
+Punkt NativeWindow::getPosition() const // returns the position
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find position
     return {r.left, r.top};
 }
 
-Punkt WFenster::getGroesse() const // returns the size
+Punkt NativeWindow::getGroesse() const // returns the size
 {
     RECT r;
     GetWindowRect(hWnd, &r); // Find size
     return {r.right - r.left, r.bottom - r.top};
 }
 
-Punkt WFenster::getKoerperGroesse() const // returns the window body size
+Punkt NativeWindow::getKoerperGroesse() const // returns the window body size
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
     return {r.right - r.left, r.bottom - r.top};
 }
 
-int WFenster::getKoerperBreite() const // returns the window body width
+int NativeWindow::getKoerperBreite() const // returns the window body width
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
     return r.right;
 }
 
-int WFenster::getKoerperHoehe() const // returns the window body height
+int NativeWindow::getKoerperHoehe() const // returns the window body height
 {
     RECT r;
     GetClientRect(hWnd, &r); // Find size
     return r.bottom;
 }
 
-HWND WFenster::getFensterHandle() const // returns a handle to the window
+HWND NativeWindow::getWindowHandle() const // returns a handle to the window
 {
     return hWnd;
 }
 
-bool WFenster::hatMausAktion() const
+bool NativeWindow::hatMausAktion() const
 {
     return mausAktion != 0;
 }
 
-bool WFenster::hatVSchliessAktion() const
+bool NativeWindow::hatVSchliessAktion() const
 {
     return vCloseAktion != 0;
 }
 
-bool WFenster::hatNSchliessAktion() const
+bool NativeWindow::hatNSchliessAktion() const
 {
     return nCloseAktion != 0;
 }
 
-bool WFenster::hatTastaturAktion() const
+bool NativeWindow::hatTastaturAktion() const
 {
     return tastaturAktion != 0;
 }
 
-Bildschirm* WFenster::getBildschirm() const
+Screen* NativeWindow::getScreen() const
 {
     if (!screen) return 0;
-    return dynamic_cast<Bildschirm*>(screen->getThis());
+    return dynamic_cast<Screen*>(screen->getThis());
 }
 
-Bildschirm* WFenster::zBildschirm() const
+Screen* NativeWindow::zScreen() const
 {
     return screen;
 }
 
-bool WFenster::istVerschiebbar()
+bool NativeWindow::istVerschiebbar()
     const // checks if the window can be moved by dragging with the mouse
 {
     return verschiebbar;
 }
 
-// Contents of the WFensterArray class from Window.h
+// Contents of the NativeWindowArray class from Window.h
 // Constructor
-WFensterArray::WFensterArray()
+NativeWindowArray::NativeWindowArray()
     : next(0),
       This(0)
 {}
 
 // Destructor
-WFensterArray::~WFensterArray()
+NativeWindowArray::~NativeWindowArray()
 {
     if (next) delete next;
 }
 
 // add und remove
-bool WFensterArray::addFenster(WFenster* fenster)
+bool NativeWindowArray::addWindow(NativeWindow* fenster)
 {
     if (fenster == This) return 0;
     if (!This)
@@ -907,17 +911,17 @@ bool WFensterArray::addFenster(WFenster* fenster)
         This = fenster;
         return 1;
     }
-    if (!next) next = new WFensterArray();
-    return next->addFenster(fenster);
+    if (!next) next = new NativeWindowArray();
+    return next->addWindow(fenster);
 }
 
-bool WFensterArray::removeFenster(WFenster* fenster)
+bool NativeWindowArray::removeWindow(NativeWindow* fenster)
 {
     if (fenster == This) return 1;
     if (!next) return 0;
-    if (next->removeFenster(fenster))
+    if (next->removeWindow(fenster))
     {
-        WFensterArray* tmp = next->getNext();
+        NativeWindowArray* tmp = next->getNext();
         next->setNext0();
         delete next;
         next = tmp;
@@ -925,22 +929,22 @@ bool WFensterArray::removeFenster(WFenster* fenster)
     return 0;
 }
 
-WFensterArray* WFensterArray::getNext()
+NativeWindowArray* NativeWindowArray::getNext()
 {
     return next;
 }
 
-void WFensterArray::setNext0()
+void NativeWindowArray::setNext0()
 {
     next = 0;
 }
 
-void WFensterArray::del()
+void NativeWindowArray::del()
 {
     if (next)
     {
         This = next->getThis();
-        WFensterArray* tmp = next->getNext();
+        NativeWindowArray* tmp = next->getNext();
         next->setNext0();
         delete next;
         next = tmp;
@@ -950,11 +954,11 @@ void WFensterArray::del()
 }
 
 // Messages
-bool WFensterArray::sendVSchliessMessage(HWND hwnd)
+bool NativeWindowArray::sendVSchliessMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getFensterHandle() == hwnd && This->hatVSchliessAktion())
+    if (This->getWindowHandle() == hwnd && This->hatVSchliessAktion())
     {
         This->doVSchliessAktion();
         ret = 1;
@@ -963,11 +967,11 @@ bool WFensterArray::sendVSchliessMessage(HWND hwnd)
     return ret || next->sendVSchliessMessage(hwnd);
 }
 
-bool WFensterArray::sendNSchliessMessage(HWND hwnd)
+bool NativeWindowArray::sendNSchliessMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getFensterHandle() == hwnd && This->hatNSchliessAktion())
+    if (This->getWindowHandle() == hwnd && This->hatNSchliessAktion())
     {
         This->doNSchliessAktion();
         ret = 1;
@@ -976,11 +980,11 @@ bool WFensterArray::sendNSchliessMessage(HWND hwnd)
     return ret || next->sendNSchliessMessage(hwnd);
 }
 
-bool WFensterArray::sendMausMessage(HWND hwnd, MausEreignis& me)
+bool NativeWindowArray::sendMausMessage(HWND hwnd, MausEreignis& me)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getFensterHandle() == hwnd && This->hatMausAktion())
+    if (This->getWindowHandle() == hwnd && This->hatMausAktion())
     {
         This->doMausAktion(me);
         ret = 1;
@@ -989,11 +993,11 @@ bool WFensterArray::sendMausMessage(HWND hwnd, MausEreignis& me)
     return ret || next->sendMausMessage(hwnd, me);
 }
 
-bool WFensterArray::sendTastaturMessage(HWND hwnd, TastaturEreignis& te)
+bool NativeWindowArray::sendTastaturMessage(HWND hwnd, TastaturEreignis& te)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getFensterHandle() == hwnd && This->hatTastaturAktion())
+    if (This->getWindowHandle() == hwnd && This->hatTastaturAktion())
     {
         This->doTastaturAktion(te);
         ret = 1;
@@ -1002,11 +1006,11 @@ bool WFensterArray::sendTastaturMessage(HWND hwnd, TastaturEreignis& te)
     return ret || next->sendTastaturMessage(hwnd, te);
 }
 
-bool WFensterArray::sendRestoreMessage(HWND hwnd)
+bool NativeWindowArray::sendRestoreMessage(HWND hwnd)
 {
     if (!This) return 0;
     bool ret = 0;
-    if (This->getFensterHandle() == hwnd && This->hatMausAktion())
+    if (This->getWindowHandle() == hwnd && This->hatMausAktion())
     {
         This->doRestoreMessage();
         ret = 1;
@@ -1015,7 +1019,7 @@ bool WFensterArray::sendRestoreMessage(HWND hwnd)
     return ret || next->sendRestoreMessage(hwnd);
 }
 
-WFenster* WFensterArray::getThis()
+NativeWindow* NativeWindowArray::getThis()
 {
     return This;
 }
@@ -1030,9 +1034,9 @@ void Framework::WMessageBox(HWND hWnd, Text* titel, Text* meldung, UINT style)
 }
 #endif
 
-// Contents of the Fenster class from Window.h
+// Contents of the Window class from Window.h
 // Constructor
-Fenster::Fenster()
+Window::Window()
     : Drawable(),
       closingMe(0),
       closingMeParam(0),
@@ -1043,7 +1047,7 @@ Fenster::Fenster()
       bgBodyPicture(0),
       bodyBuffer(0),
       bgClosingFarbe(0xFF000000),
-      bgClosingBild(0),
+      bgClosingImage(0),
       closeBuffer(0),
       closeKlickBuffer(0),
       vScroll(0),
@@ -1064,21 +1068,21 @@ Fenster::Fenster()
 }
 
 // Destructor
-Fenster::~Fenster()
+Window::~Window()
 {
     if (rahmen) rahmen->release();
     if (titel) titel->release();
     members->release();
     if (bodyBuffer) bodyBuffer->release();
     if (bgBodyPicture) bgBodyPicture->release();
-    if (bgClosingBild) bgClosingBild->release();
+    if (bgClosingImage) bgClosingImage->release();
     if (closeBuffer) closeBuffer->release();
     if (closeKlickBuffer) closeKlickBuffer->release();
     if (vScroll) vScroll->release();
     if (hScroll) hScroll->release();
 }
 
-void Fenster::doMausEreignis(MausEreignis& me, bool userRet)
+void Window::doMausEreignis(MausEreignis& me, bool userRet)
 {
     if (me.id == ME_Leaves)
     {
@@ -1093,7 +1097,7 @@ void Fenster::doMausEreignis(MausEreignis& me, bool userRet)
         me.verarbeitet |= hatStyleNicht(Style::Sichtbar);
         me.insideParent = 0;
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+        if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
         int th = 0;
         if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
         me.mx -= rbr;
@@ -1116,7 +1120,7 @@ void Fenster::doMausEreignis(MausEreignis& me, bool userRet)
     bool mvtmp = me.verarbeitet;
     if (hatStyleNicht(Style::Erlaubt)) me.verarbeitet = 1;
     int rbr = 0;
-    if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
     int th = 0;
     if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
     bool hSc = hatStyle(Style::HScroll) && hScroll;
@@ -1379,50 +1383,50 @@ void Fenster::doMausEreignis(MausEreignis& me, bool userRet)
 
 // non-const
 // -- Border --
-void Fenster::setRahmenZ(Rahmen* ram) // sets the border
+void Window::setBorderZ(Border* ram) // sets the border
 {
     if (rahmen) rahmen->release();
     rahmen = ram;
     rend = 1;
 }
 
-void Fenster::setRFarbe(int f) // sets the border color
+void Window::setRFarbe(int f) // sets the border color
 {
-    if (!rahmen) rahmen = new LRahmen();
+    if (!rahmen) rahmen = new LBorder();
     rahmen->setFarbe(f);
     rend = 1;
 }
 
-void Fenster::setRBreite(int br) // sets the border width
+void Window::setRBreite(int br) // sets the border width
 {
-    if (!rahmen) rahmen = new LRahmen();
+    if (!rahmen) rahmen = new LBorder();
     rahmen->setRamenBreite(br);
     rend = 1;
 }
 
 // -- Title --
-void Fenster::setTitel(Text* txt) // sets the title
+void Window::setTitel(Text* txt) // sets the title
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setText(txt);
     rend = 1;
 }
 
-void Fenster::setTitelZ(Text* txt)
+void Window::setTitelZ(Text* txt)
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setTextZ(txt);
     rend = 1;
 }
 
-void Fenster::setTitel(const char* txt)
+void Window::setTitel(const char* txt)
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setText(txt);
     rend = 1;
 }
 
-void Fenster::setTTextFeldZ(TextFeld* tf) // sets the title text field
+void Window::setTTextFeldZ(TextField* tf) // sets the title text field
 {
     if (titel) titel->release();
     titel = tf;
@@ -1430,106 +1434,106 @@ void Fenster::setTTextFeldZ(TextFeld* tf) // sets the title text field
 }
 
 // -- Font --
-void Fenster::setTSchriftZ(Schrift* schrift) // sets the title font
+void Window::setTFontZ(Font* schrift) // sets the title font
 {
-    if (!titel) titel = new TextFeld();
-    titel->setSchriftZ(schrift);
+    if (!titel) titel = new TextField();
+    titel->setFontZ(schrift);
     rend = 1;
 }
 
-void Fenster::setTSFarbe(int f) // sets the title font color
+void Window::setTSFarbe(int f) // sets the title font color
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setSchriftFarbe(f);
     rend = 1;
 }
 
-void Fenster::setTSSize(int gr) // sets the title font size
+void Window::setTSSize(int gr) // sets the title font size
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setSchriftSize((unsigned char)gr);
     rend = 1;
 }
 
 // -- Title Background --
-void Fenster::setTBgFarbe(int f) // sets title background color
+void Window::setTBgFarbe(int f) // sets title background color
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setHintergrundFarbe(f);
     rend = 1;
 }
 
 // -- Title AlphaFeld --
-void Fenster::setTAlphaFeldZ(AlphaFeld* af) // sets the title AlphaFeld
+void Window::setTAlphaFeldZ(AlphaFeld* af) // sets the title AlphaFeld
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setAlphaFeldZ(af);
     rend = 1;
 }
 
-void Fenster::setTAfFarbe(int f) // sets the title AlphaFeld color
+void Window::setTAfFarbe(int f) // sets the title AlphaFeld color
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setAlphaFeldFarbe(f);
     rend = 1;
 }
 
-void Fenster::setTAfStrength(int st) // sets the strength of the title AlphaFeld
+void Window::setTAfStrength(int st) // sets the strength of the title AlphaFeld
 {
-    if (!titel) titel = new TextFeld();
+    if (!titel) titel = new TextField();
     titel->setAlphaFeldStrength(st);
     rend = 1;
 }
 
 // -- Title Background Image --
-void Fenster::setTBgBild(Bild* b) // sets the title background image
+void Window::setTBgImage(Image* b) // sets the title background image
 {
-    if (!titel) titel = new TextFeld();
-    titel->setHintergrundBild(b);
+    if (!titel) titel = new TextField();
+    titel->setHintergrundImage(b);
     rend = 1;
 }
 
-void Fenster::setTBgBildZ(Bild* b)
+void Window::setTBgImageZ(Image* b)
 {
-    if (!titel) titel = new TextFeld();
-    titel->setHintergrundBildZ(b);
+    if (!titel) titel = new TextField();
+    titel->setHintergrundImageZ(b);
     rend = 1;
 }
 
 // -- Title Border --
-void Fenster::setTRahmenZ(Rahmen* ram) // sets the title border
+void Window::setTBorderZ(Border* ram) // sets the title border
 {
-    if (!titel) titel = new TextFeld();
-    titel->setRahmenZ(ram);
+    if (!titel) titel = new TextField();
+    titel->setBorderZ(ram);
     rend = 1;
 }
 
-void Fenster::setTRFarbe(int f) // sets the title border color
+void Window::setTRFarbe(int f) // sets the title border color
 {
-    if (!titel) titel = new TextFeld();
-    titel->setRahmenFarbe(f);
+    if (!titel) titel = new TextField();
+    titel->setBorderColor(f);
     rend = 1;
 }
 
-void Fenster::setTRBreite(int br) // sets the title border width
+void Window::setTRBreite(int br) // sets the title border width
 {
-    if (!titel) titel = new TextFeld();
-    titel->setRahmenBreite(br);
+    if (!titel) titel = new TextField();
+    titel->setBorderWidth(br);
     rend = 1;
 }
 
 // -- Body Background --
-void Fenster::setKBgFarbe(int f) // sets the body background color
+void Window::setKBgFarbe(int f) // sets the body background color
 {
     bgBodyColor = f;
     rend = 1;
 }
 
 // -- Body Background Image --
-void Fenster::setKBgBild(Bild* b) // sets the body background image
+void Window::setKBgImage(Image* b) // sets the body background image
 {
-    if (!bgBodyPicture) bgBodyPicture = new Bild();
-    bgBodyPicture->neuBild(b->getBreite(), b->getHeight(), 0);
+    if (!bgBodyPicture) bgBodyPicture = new Image();
+    bgBodyPicture->neuImage(b->getBreite(), b->getHeight(), 0);
     int* buff1 = bgBodyPicture->getBuffer();
     int* buff2 = b->getBuffer();
     int gr = bgBodyPicture->getBreite() * bgBodyPicture->getHeight();
@@ -1539,7 +1543,7 @@ void Fenster::setKBgBild(Bild* b) // sets the body background image
     rend = 1;
 }
 
-void Fenster::setKBgBildZ(Bild* b)
+void Window::setKBgImageZ(Image* b)
 {
     if (bgBodyPicture) bgBodyPicture->release();
     bgBodyPicture = b;
@@ -1547,21 +1551,21 @@ void Fenster::setKBgBildZ(Bild* b)
 }
 
 // -- Body AlphaFeld --
-void Fenster::setKAlphaFeldZ(AlphaFeld* af) // sets the body AlphaFeld
+void Window::setKAlphaFeldZ(AlphaFeld* af) // sets the body AlphaFeld
 {
     if (bodyBuffer) bodyBuffer->release();
     bodyBuffer = af;
     rend = 1;
 }
 
-void Fenster::setKAfFarbe(int f) // sets body AlphaFeld color
+void Window::setKAfFarbe(int f) // sets body AlphaFeld color
 {
     if (!bodyBuffer) bodyBuffer = new AlphaFeld();
     bodyBuffer->setFarbe(f);
     rend = 1;
 }
 
-void Fenster::setKAfStrength(int st) // sets the strength of the body AlphaFeld
+void Window::setKAfStrength(int st) // sets the strength of the body AlphaFeld
 {
     if (!bodyBuffer) bodyBuffer = new AlphaFeld();
     bodyBuffer->setStrength(st);
@@ -1569,60 +1573,60 @@ void Fenster::setKAfStrength(int st) // sets the strength of the body AlphaFeld
 }
 
 // -- Close --
-void Fenster::setClosingMeParam(void* param)
+void Window::setClosingMeParam(void* param)
 {
     closingMeParam = param;
 }
 
-void Fenster::setClosingMe(MausAktion closingMe) // sets the close mouse event
+void Window::setClosingMe(MausAktion closingMe) // sets the close mouse event
 {
     this->closingMe = closingMe;
 }
 
 // -- Close Background --
-void Fenster::setSBgFarbe(int f) // sets the close background color
+void Window::setSBgFarbe(int f) // sets the close background color
 {
     bgClosingFarbe = f;
     rend = 1;
 }
 
 // -- Close Background Image --
-void Fenster::setSBgBild(Bild* b) // sets the close background image
+void Window::setSBgImage(Image* b) // sets the close background image
 {
-    if (!bgClosingBild) bgClosingBild = new Bild();
-    bgClosingBild->neuBild(b->getBreite(), b->getHeight(), 0);
-    int* buff1 = bgClosingBild->getBuffer();
+    if (!bgClosingImage) bgClosingImage = new Image();
+    bgClosingImage->neuImage(b->getBreite(), b->getHeight(), 0);
+    int* buff1 = bgClosingImage->getBuffer();
     int* buff2 = b->getBuffer();
-    int gr = bgClosingBild->getBreite() * bgClosingBild->getHeight();
+    int gr = bgClosingImage->getBreite() * bgClosingImage->getHeight();
     for (int i = 0; i < gr; ++i)
         buff1[i] = buff2[i];
     b->release();
     rend = 1;
 }
 
-void Fenster::setSBgBildZ(Bild* b)
+void Window::setSBgImageZ(Image* b)
 {
-    if (bgClosingBild) bgClosingBild->release();
-    bgClosingBild = b;
+    if (bgClosingImage) bgClosingImage->release();
+    bgClosingImage = b;
     rend = 1;
 }
 
 // -- Close AlphaFeld --
-void Fenster::setSAlphaFeldZ(AlphaFeld* af) // sets the close AlphaFeld
+void Window::setSAlphaFeldZ(AlphaFeld* af) // sets the close AlphaFeld
 {
     if (closeBuffer) closeBuffer->release();
     closeBuffer = af;
     rend = 1;
 }
 
-void Fenster::setSAfFarbe(int f) // sets the color of the close AlphaFeld
+void Window::setSAfFarbe(int f) // sets the color of the close AlphaFeld
 {
     if (!closeBuffer) closeBuffer = new AlphaFeld();
     closeBuffer->setFarbe(f);
     rend = 1;
 }
 
-void Fenster::setSAfStrength(int st) // sets the strength of the close AlphaFeld
+void Window::setSAfStrength(int st) // sets the strength of the close AlphaFeld
 {
     if (!closeBuffer) closeBuffer = new AlphaFeld();
     closeBuffer->setStrength(st);
@@ -1630,21 +1634,21 @@ void Fenster::setSAfStrength(int st) // sets the strength of the close AlphaFeld
 }
 
 // -- Close Click AlphaFeld --
-void Fenster::setSKAlphaFeldZ(AlphaFeld* af) // sets the close click AlphaFeld
+void Window::setSKAlphaFeldZ(AlphaFeld* af) // sets the close click AlphaFeld
 {
     if (closeKlickBuffer) closeKlickBuffer->release();
     closeKlickBuffer = af;
     rend = 1;
 }
 
-void Fenster::setSKAfFarbe(int f) // sets the color of the close click AlphaFeld
+void Window::setSKAfFarbe(int f) // sets the color of the close click AlphaFeld
 {
     if (!closeKlickBuffer) closeKlickBuffer = new AlphaFeld();
     closeKlickBuffer->setFarbe(f);
     rend = 1;
 }
 
-void Fenster::setSKAfStrength(
+void Window::setSKAfStrength(
     int st) // sets the strength of the close click AlphaFeld
 {
     if (!closeKlickBuffer) closeKlickBuffer = new AlphaFeld();
@@ -1653,52 +1657,52 @@ void Fenster::setSKAfStrength(
 }
 
 // -- min max --
-void Fenster::setMin(int mx, int my) // sets the minimum window size
+void Window::setMin(int mx, int my) // sets the minimum window size
 {
     min.x = mx;
     min.y = my;
 }
 
-void Fenster::setMin(const Punkt& min)
+void Window::setMin(const Punkt& min)
 {
     this->min = min;
 }
 
-void Fenster::setMax(int mx, int my) // sets the maximum window size
+void Window::setMax(int mx, int my) // sets the maximum window size
 {
     max.x = mx;
     max.y = my;
 }
 
-void Fenster::setMax(const Punkt& max)
+void Window::setMax(const Punkt& max)
 {
     this->max = max;
 }
 
-void Fenster::setKMin(int mx, int my) // sets the minimum body size
+void Window::setKMin(int mx, int my) // sets the minimum body size
 {
     kMin.x = mx;
     kMin.y = my;
 }
 
-void Fenster::setKMin(const Punkt& min)
+void Window::setKMin(const Punkt& min)
 {
     kMin = min;
 }
 
-void Fenster::setKMax(int mx, int my) // sets the maximum body size
+void Window::setKMax(int mx, int my) // sets the maximum body size
 {
     kMax.x = mx;
     kMax.y = my;
 }
 
-void Fenster::setKMax(const Punkt& max)
+void Window::setKMax(const Punkt& max)
 {
     kMax = max;
 }
 
 // -- scroll --
-void Fenster::setHScrollBarZ(
+void Window::setHScrollBarZ(
     HScrollBar* hScroll) // sets the horizontal scroll bar
 {
     if (this->hScroll) this->hScroll->release();
@@ -1706,31 +1710,30 @@ void Fenster::setHScrollBarZ(
     rend = 1;
 }
 
-void Fenster::setVScrollBarZ(
-    VScrollBar* vScroll) // sets the vertical scroll bar
+void Window::setVScrollBarZ(VScrollBar* vScroll) // sets the vertical scroll bar
 {
     if (this->vScroll) this->vScroll->release();
     this->vScroll = vScroll;
     rend = 1;
 }
 
-void Fenster::setHSBMax(int max) // sets the scroll maximum
+void Window::setHSBMax(int max) // sets the scroll maximum
 {
     if (!hScroll) hScroll = new HScrollBar();
     int rbr = 0;
-    if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
     int vsh = 0;
     if (hatStyle(Style::VScroll) && vScroll) vsh = 15;
     hScroll->update(max, gr.x - rbr * 2 - vsh);
     rend = 1;
 }
 
-void Fenster::setVSBMax(int max)
+void Window::setVSBMax(int max)
 {
     if (!vScroll) vScroll = new VScrollBar();
     int rbr = 0;
     int th = 0;
-    if (hatStyle(Style::Rahmen) && rahmen) rbr = rahmen->getRBreite();
+    if (hatStyle(Style::Border) && rahmen) rbr = rahmen->getRBreite();
     if (hatStyle(Style::Titel) && titel) th = titel->getHeight();
     int hsh = 0;
     if (hatStyle(Style::HScroll) && hScroll) hsh = 15;
@@ -1738,21 +1741,21 @@ void Fenster::setVSBMax(int max)
     rend = 1;
 }
 
-void Fenster::setHSBScroll(int scroll) // sets the current scroll position
+void Window::setHSBScroll(int scroll) // sets the current scroll position
 {
     if (!hScroll) hScroll = new HScrollBar();
     hScroll->scroll(scroll);
     rend = 1;
 }
 
-void Fenster::setVSBScroll(int scroll)
+void Window::setVSBScroll(int scroll)
 {
     if (!vScroll) vScroll = new VScrollBar();
     vScroll->scroll(scroll);
     rend = 1;
 }
 
-void Framework::Fenster::updateHScroll()
+void Framework::Window::updateHScroll()
 {
     if (hScroll)
     {
@@ -1760,7 +1763,7 @@ void Framework::Fenster::updateHScroll()
     }
 }
 
-void Framework::Fenster::updateVScroll()
+void Framework::Window::updateVScroll()
 {
     if (vScroll)
     {
@@ -1769,20 +1772,20 @@ void Framework::Fenster::updateVScroll()
 }
 
 // -- Members --
-void Fenster::addMember(Drawable* obj) // adds a member
+void Window::addMember(Drawable* obj) // adds a member
 {
     members->add(obj);
     rend = 1;
 }
 
-void Framework::Fenster::setMemberIndex(Drawable* zMember, int index)
+void Framework::Window::setMemberIndex(Drawable* zMember, int index)
 {
     if (index < 0 || index >= members->getEintragAnzahl()) return;
     int currentIndex = members->indexOf(zMember);
     members->setPosition(currentIndex, index);
 }
 
-void Fenster::removeMember(Drawable* zObj) // removes a member
+void Window::removeMember(Drawable* zObj) // removes a member
 {
     for (int i = 0; i < members->getEintragAnzahl(); i++)
     {
@@ -1794,14 +1797,14 @@ void Fenster::removeMember(Drawable* zObj) // removes a member
     }
 }
 
-void Fenster::removeAll()
+void Window::removeAll()
 {
     members->leeren();
     rend = 1;
 }
 
 // -- Messages --
-bool Fenster::tick(double tickval) // tick
+bool Window::tick(double tickval) // tick
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -1818,7 +1821,7 @@ bool Fenster::tick(double tickval) // tick
     return Drawable::tick(tickval);
 }
 
-void Fenster::doTastaturEreignis(TastaturEreignis& te)
+void Window::doTastaturEreignis(TastaturEreignis& te)
 {
     bool ntakc = !te.verarbeitet;
     if (hatStyle(Style::Sichtbar))
@@ -1842,7 +1845,7 @@ void Fenster::doTastaturEreignis(TastaturEreignis& te)
 }
 
 // -- Render --
-void Fenster::render(Bild& zRObj) // draws to zRObj
+void Window::render(Image& zRObj) // draws to zRObj
 {
     if (hatStyle(Style::Sichtbar))
     {
@@ -1854,7 +1857,7 @@ void Fenster::render(Bild& zRObj) // draws to zRObj
         }
         Drawable::render(zRObj);
         int rbr = 0;
-        if (hatStyle(Style::Rahmen) && rahmen)
+        if (hatStyle(Style::Border) && rahmen)
         {
             rahmen->setSize(gr);
             rahmen->render(zRObj);
@@ -1862,17 +1865,17 @@ void Fenster::render(Bild& zRObj) // draws to zRObj
         }
         int th = 0;
         if (titel)
-            titel->setStyle(TextFeld::Style::Sichtbar, hatStyle(Style::Titel));
+            titel->setStyle(TextField::Style::Sichtbar, hatStyle(Style::Titel));
         if (hatStyle(Style::Titel) && titel)
         {
-            titel->setStyle(TextFeld::Style::Hintergrund,
+            titel->setStyle(TextField::Style::Hintergrund,
                 hatStyle(Style::TitelHintergrund));
             titel->setStyle(
-                TextFeld::Style::HAlpha, hatStyle(Style::TitelHAlpha));
+                TextField::Style::HAlpha, hatStyle(Style::TitelHAlpha));
             titel->setStyle(
-                TextFeld::Style::HBild, hatStyle(Style::TitelHBild));
+                TextField::Style::HImage, hatStyle(Style::TitelHImage));
             titel->setStyle(
-                TextFeld::Style::Buffered, hatStyle(Style::TitelBuffered));
+                TextField::Style::Buffered, hatStyle(Style::TitelBuffered));
             th = titel->getHeight();
             if (!zRObj.setDrawOptions(rbr, rbr, gr.x - rbr * 2, th))
             {
@@ -1892,17 +1895,23 @@ void Fenster::render(Bild& zRObj) // draws to zRObj
                     else
                         zRObj.fillRegion(
                             gr.x - th - rbr * 2, 0, th, th, bgClosingFarbe);
-                    if (hatStyle(Style::ClosingHBild) && bgClosingBild)
+                    if (hatStyle(Style::ClosingHImage) && bgClosingImage)
                     {
                         if (hatStyle(Style::ClosingHAlpha))
-                            zRObj.alphaBild(
-                                gr.x - th - rbr * 2, 0, th, th, *bgClosingBild);
+                            zRObj.alphaImage(gr.x - th - rbr * 2,
+                                0,
+                                th,
+                                th,
+                                *bgClosingImage);
                         else
-                            zRObj.drawBild(
-                                gr.x - th - rbr * 2, 0, th, th, *bgClosingBild);
+                            zRObj.drawImage(gr.x - th - rbr * 2,
+                                0,
+                                th,
+                                th,
+                                *bgClosingImage);
                     }
                 }
-                if (!hatStyle(Style::ClosingHBild) || !bgClosingBild)
+                if (!hatStyle(Style::ClosingHImage) || !bgClosingImage)
                 {
                     zRObj.drawLinie(Punkt(gr.x - th - rbr * 2, 0),
                         Punkt(gr.x - rbr * 2, th),
@@ -1960,12 +1969,12 @@ void Fenster::render(Bild& zRObj) // draws to zRObj
                 zRObj.alphaRegion(0, 0, br, hi, bgBodyColor);
             else
                 zRObj.fillRegion(0, 0, br, hi, bgBodyColor);
-            if (hatStyle(Style::BodyHBild) && bgBodyPicture)
+            if (hatStyle(Style::BodyHImage) && bgBodyPicture)
             {
                 if (hatStyle(Style::BodyHAlpha))
-                    zRObj.alphaBild(0, 0, br, hi, *bgBodyPicture);
+                    zRObj.alphaImage(0, 0, br, hi, *bgBodyPicture);
                 else
-                    zRObj.drawBild(0, 0, br, hi, *bgBodyPicture);
+                    zRObj.drawImage(0, 0, br, hi, *bgBodyPicture);
             }
         }
         if (hatStyle(Style::BodyBuffered) && bodyBuffer)
@@ -1993,13 +2002,13 @@ void Fenster::render(Bild& zRObj) // draws to zRObj
 
 // constant
 // Returns the width of the interior area of the drawing in pixels
-int Fenster::getInnenBreite() const
+int Window::getInnenBreite() const
 {
     return getBreite() - 2 * getRBreite();
 }
 
 // Returns the height of the interior area of the drawing in pixels
-int Fenster::getInnenHeight() const
+int Window::getInnenHeight() const
 {
     int th = 0;
     if (hatStyle(Style::Titel) && titel) th += titel->getHeight();
@@ -2007,105 +2016,105 @@ int Fenster::getInnenHeight() const
 }
 
 // -- Border --
-Rahmen* Fenster::getRahmen() const // returns the border
+Border* Window::getBorder() const // returns the border
 {
     if (!rahmen) return 0;
-    return dynamic_cast<Rahmen*>(rahmen->getThis());
+    return dynamic_cast<Border*>(rahmen->getThis());
 }
 
-Rahmen* Fenster::zRahmen() const
+Border* Window::zBorder() const
 {
     return rahmen;
 }
 
-int Fenster::getRFarbe() const // returns the border color
+int Window::getRFarbe() const // returns the border color
 {
     if (!rahmen) return 0;
     return rahmen->getFarbe();
 }
 
-int Fenster::getRBreite() const // returns the border width
+int Window::getRBreite() const // returns the border width
 {
-    if (!rahmen || hatStyleNicht(Style::Rahmen)) return 0;
+    if (!rahmen || hatStyleNicht(Style::Border)) return 0;
     return rahmen->getRBreite();
 }
 
 // -- Title --
-Text* Fenster::getTitel() const // returns the title
+Text* Window::getTitel() const // returns the title
 {
     if (!titel) return 0;
     return titel->getText();
 }
 
-Text* Fenster::zTitel() const
+Text* Window::zTitel() const
 {
     if (!titel) return 0;
     return titel->zText();
 }
 
-TextFeld* Fenster::getTTextFeld() const // returns the title text field
+TextField* Window::getTTextField() const // returns the title text field
 {
     if (!titel) return 0;
-    return dynamic_cast<TextFeld*>(titel->getThis());
+    return dynamic_cast<TextField*>(titel->getThis());
 }
 
-TextFeld* Fenster::zTTextFeld() const
+TextField* Window::zTTextField() const
 {
     return titel;
 }
 
 // -- Title Font --
-Schrift* Fenster::getTSchrift() const // returns the title font
+Font* Window::getTFont() const // returns the title font
 {
     if (!titel) return 0;
-    return titel->getSchrift();
+    return titel->getFont();
 }
 
-Schrift* Fenster::zTSchrift() const
+Font* Window::zTFont() const
 {
     if (!titel) return 0;
-    return titel->zSchrift();
+    return titel->zFont();
 }
 
-int Fenster::getTSFarbe() const // returns the title font color
+int Window::getTSFarbe() const // returns the title font color
 {
     if (!titel) return 0;
     return titel->getSchriftFarbe();
 }
 
-int Fenster::getTSSize() const // returns the title font size
+int Window::getTSSize() const // returns the title font size
 {
     if (!titel) return 0;
     return titel->getSchriftSize();
 }
 
 // -- Title Background --
-int Fenster::getTBgFarbe() const // returns the title background color
+int Window::getTBgFarbe() const // returns the title background color
 {
     if (!titel) return 0;
     return titel->getHintergrundFarbe();
 }
 
 // -- Title AlphaFeld --
-AlphaFeld* Fenster::getTAlphaFeld() const // returns the title AlphaFeld
+AlphaFeld* Window::getTAlphaFeld() const // returns the title AlphaFeld
 {
     if (!titel) return 0;
     return titel->getAlphaFeld();
 }
 
-AlphaFeld* Fenster::zTAlphaFeld() const
+AlphaFeld* Window::zTAlphaFeld() const
 {
     if (!titel) return 0;
     return titel->zAlphaFeld();
 }
 
-int Fenster::getTAfFarbe() const // returns the color of the title AlphaFeld
+int Window::getTAfFarbe() const // returns the color of the title AlphaFeld
 {
     if (!titel) return 0;
     return titel->getAlphaFeldFarbe();
 }
 
-int Fenster::getTAfStrength()
+int Window::getTAfStrength()
     const // returns the strength of the title AlphaFeld
 {
     if (!titel) return 0;
@@ -2113,123 +2122,122 @@ int Fenster::getTAfStrength()
 }
 
 // -- Title Background Image --
-Bild* Fenster::getTBgBild() const // returns the title background image
+Image* Window::getTBgImage() const // returns the title background image
 {
     if (!titel) return 0;
-    return titel->getHintergrundBild();
+    return titel->getHintergrundImage();
 }
 
-Bild* Fenster::zTBgBild() const
+Image* Window::zTBgImage() const
 {
     if (!titel) return 0;
-    return titel->zHintergrundBild();
+    return titel->zHintergrundImage();
 }
 
 // -- Title Border --
-Rahmen* Fenster::getTRahmen() const // returns the title border
+Border* Window::getTBorder() const // returns the title border
 {
     if (!titel) return 0;
-    return titel->getRahmen();
+    return titel->getBorder();
 }
 
-Rahmen* Fenster::zTRahmen() const
+Border* Window::zTBorder() const
 {
     if (!titel) return 0;
-    return titel->zRahmen();
+    return titel->zBorder();
 }
 
-int Fenster::getTRFarbe() const // returns the title border color
+int Window::getTRFarbe() const // returns the title border color
 {
     if (!titel) return 0;
-    return titel->getRahmenFarbe();
+    return titel->getBorderColor();
 }
 
-int Fenster::getTRBreite() const // returns the title border width
+int Window::getTRBreite() const // returns the title border width
 {
     if (!titel) return 0;
-    return titel->getRahmenBreite();
+    return titel->getBorderWidth();
 }
 
 // -- Body Background --
-int Fenster::getKBgFarbe() const // returns the body background color
+int Window::getKBgFarbe() const // returns the body background color
 {
     return bgBodyColor;
 }
 
 // -- Body Background Image --
-Bild* Fenster::getKBgBild() const // returns the body background image
+Image* Window::getKBgImage() const // returns the body background image
 {
     if (!bgBodyPicture) return 0;
-    return dynamic_cast<Bild*>(bgBodyPicture->getThis());
+    return dynamic_cast<Image*>(bgBodyPicture->getThis());
 }
 
-Bild* Fenster::zKBgBild() const
+Image* Window::zKBgImage() const
 {
     return bgBodyPicture;
 }
 
 // -- Body AlphaFeld --
-AlphaFeld* Fenster::getKAlphaFeld() const // returns the body AlphaFeld
+AlphaFeld* Window::getKAlphaFeld() const // returns the body AlphaFeld
 {
     if (!bodyBuffer) return 0;
     return dynamic_cast<AlphaFeld*>(bodyBuffer->getThis());
 }
 
-AlphaFeld* Fenster::zKAlphaFeld() const
+AlphaFeld* Window::zKAlphaFeld() const
 {
     return bodyBuffer;
 }
 
-int Fenster::getKAfFarbe() const // returns the body AlphaFeld color
+int Window::getKAfFarbe() const // returns the body AlphaFeld color
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getFarbe();
 }
 
-int Fenster::getKAfStrength()
-    const // returns the strength of the body AlphaFeld
+int Window::getKAfStrength() const // returns the strength of the body AlphaFeld
 {
     if (!bodyBuffer) return 0;
     return bodyBuffer->getStrength();
 }
 
 // -- Close Background --
-int Fenster::getSBgFarbe() const // returns the close background color
+int Window::getSBgFarbe() const // returns the close background color
 {
     return bgClosingFarbe;
 }
 
 // -- Close Background Image --
-Bild* Fenster::getSBgBild() const // returns the close background image
+Image* Window::getSBgImage() const // returns the close background image
 {
-    if (!bgClosingBild) return 0;
-    return dynamic_cast<Bild*>(bgClosingBild->getThis());
+    if (!bgClosingImage) return 0;
+    return dynamic_cast<Image*>(bgClosingImage->getThis());
 }
 
-Bild* Fenster::zSBgBild() const
+Image* Window::zSBgImage() const
 {
-    return bgClosingBild;
+    return bgClosingImage;
 }
 
 // -- Close AlphaFeld --
-AlphaFeld* Fenster::getSAlphaFeld() const // returns the close AlphaFeld
+AlphaFeld* Window::getSAlphaFeld() const // returns the close AlphaFeld
 {
     if (!closeBuffer) return 0;
     return dynamic_cast<AlphaFeld*>(closeBuffer->getThis());
 }
 
-AlphaFeld* Fenster::zSAlphaFeld() const
+AlphaFeld* Window::zSAlphaFeld() const
 {
     return closeBuffer;
 }
 
-int Fenster::getSAfFarbe() const // returns the close AlphaFeld color
+int Window::getSAfFarbe() const // returns the close AlphaFeld color
 {
     if (!closeBuffer) return 0;
     return closeBuffer->getFarbe();
 }
 
-int Fenster::getSAfStrength()
+int Window::getSAfStrength()
     const // returns the strength of the close AlphaFeld
 {
     if (!closeBuffer) return 0;
@@ -2237,24 +2245,24 @@ int Fenster::getSAfStrength()
 }
 
 // -- Close Click AlphaFeld --
-AlphaFeld* Fenster::getSKAlphaFeld() const // returns the close click AlphaFeld
+AlphaFeld* Window::getSKAlphaFeld() const // returns the close click AlphaFeld
 {
     if (!closeKlickBuffer) return 0;
     return dynamic_cast<AlphaFeld*>(closeKlickBuffer->getThis());
 }
 
-AlphaFeld* Fenster::zSKAlphaFeld() const
+AlphaFeld* Window::zSKAlphaFeld() const
 {
     return closeKlickBuffer;
 }
 
-int Fenster::getSKAfFarbe() const // returns the close click AlphaFeld color
+int Window::getSKAfFarbe() const // returns the close click AlphaFeld color
 {
     if (!closeKlickBuffer) return 0;
     return closeKlickBuffer->getFarbe();
 }
 
-int Fenster::getSKAfStrength()
+int Window::getSKAfStrength()
     const // returns the strength of the close click AlphaFeld
 {
     if (!closeKlickBuffer) return 0;
@@ -2262,56 +2270,56 @@ int Fenster::getSKAfStrength()
 }
 
 // -- min max --
-const Punkt& Fenster::getMin() const // returns the minimum window size
+const Punkt& Window::getMin() const // returns the minimum window size
 {
     return min;
 }
 
-const Punkt& Fenster::getMax() const // returns the maximum window size
+const Punkt& Window::getMax() const // returns the maximum window size
 {
     return max;
 }
 
-const Punkt& Fenster::getKMin() const // returns the minimum body size
+const Punkt& Window::getKMin() const // returns the minimum body size
 {
     return kMin;
 }
 
-const Punkt& Fenster::getKMax() const // returns the maximum body size
+const Punkt& Window::getKMax() const // returns the maximum body size
 {
     return kMax;
 }
 
 // -- scroll --
-VScrollBar* Fenster::getVScrollBar() const // returns the vertical scroll bar
+VScrollBar* Window::getVScrollBar() const // returns the vertical scroll bar
 {
     if (!vScroll) return 0;
     return dynamic_cast<VScrollBar*>(vScroll->getThis());
 }
 
-VScrollBar* Fenster::zVScrollBar() const
+VScrollBar* Window::zVScrollBar() const
 {
     return vScroll;
 }
 
-HScrollBar* Fenster::getHScrollBar() const // returns the horizontal scroll bar
+HScrollBar* Window::getHScrollBar() const // returns the horizontal scroll bar
 {
     if (!hScroll) return 0;
     return dynamic_cast<HScrollBar*>(hScroll->getThis());
 }
 
-HScrollBar* Fenster::zHScrollBar() const
+HScrollBar* Window::zHScrollBar() const
 {
     return hScroll;
 }
 
 // -- Members --
-const RCArray<Drawable>& Fenster::getMembers() const // returns the members
+const RCArray<Drawable>& Window::getMembers() const // returns the members
 {
     return *members;
 }
 
-int Framework::Fenster::getNeededChildWidth() const
+int Framework::Window::getNeededChildWidth() const
 {
     int max = 0;
     for (Drawable* z : *members)
@@ -2321,7 +2329,7 @@ int Framework::Fenster::getNeededChildWidth() const
     return max;
 }
 
-int Framework::Fenster::getNeededChildHeight() const
+int Framework::Window::getNeededChildHeight() const
 {
     int max = 0;
     for (Drawable* z : *members)
@@ -2332,9 +2340,9 @@ int Framework::Fenster::getNeededChildHeight() const
 }
 
 // -- Copy --
-Drawable* Fenster::dublizieren() const // Creates a copy of the window
+Drawable* Window::dublizieren() const // Creates a copy of the window
 {
-    Fenster* ret = new Fenster();
+    Window* ret = new Window();
     ret->setPosition(pos);
     ret->setSize(gr);
     ret->setMausEreignisParameter(makParam);
@@ -2350,18 +2358,18 @@ Drawable* Fenster::dublizieren() const // Creates a copy of the window
         ret->setRBreite(rahmen->getRBreite());
         ret->setRFarbe(rahmen->getFarbe());
     }
-    if (titel) ret->setTTextFeldZ((TextFeld*)titel->dublizieren());
+    if (titel) ret->setTTextFeldZ((TextField*)titel->dublizieren());
     ret->setKBgFarbe(bgBodyColor);
     if (bgBodyPicture)
-        ret->setKBgBild(dynamic_cast<Bild*>(bgBodyPicture->getThis()));
+        ret->setKBgImage(dynamic_cast<Image*>(bgBodyPicture->getThis()));
     if (bodyBuffer)
     {
         ret->setKAfFarbe(bodyBuffer->getFarbe());
         ret->setKAfStrength(bodyBuffer->getStrength());
     }
     ret->setSBgFarbe(bgClosingFarbe);
-    if (bgClosingBild)
-        ret->setSBgBild(dynamic_cast<Bild*>(bgClosingBild->getThis()));
+    if (bgClosingImage)
+        ret->setSBgImage(dynamic_cast<Image*>(bgClosingImage->getThis()));
     if (closeBuffer)
     {
         ret->setSAfFarbe(closeBuffer->getFarbe());

Window.h

@@ -1,5 +1,5 @@
-#ifndef Fenster_H
-#define Fenster_H
+#ifndef Window_H
+#define Window_H
 
 #include "Array.h"
 #include "Drawing.h"
@@ -8,16 +8,16 @@ namespace Framework
 {
     class VScrollBar;    //! Scroll.h
     class HScrollBar;    //! Scroll.h
-    class TextFeld;      //! TextField.h
-    class Rahmen;        //! Border.h
-    class Bildschirm;    //! Screen.h
+    class TextField;      //! TextField.h
+    class Border;        //! Border.h
+    class Screen;    //! Screen.h
     class AlphaFeld;     //! AlphaField.h
-    class Schrift;       //! Font.h
+    class Font;       //! Font.h
     class Text;          //! Text.h
-    class Bild;          //! Image.h
-    class WFenster;      //! from this file
-    class WFensterArray; //! from this file
-    class Fenster;       //! from this file
+    class Image;          //! Image.h
+    class NativeWindow;      //! from this file
+    class NativeWindowArray; //! from this file
+    class Window;       //! from this file
 #ifdef WIN32
     //! Creates a normal window class of the Windows API
     //! \param hInst The HINSTANCE of the program (passed by the Framework to
@@ -45,7 +45,7 @@ namespace Framework
         int virtualKeyCode, int scanCode, TastaturEreignis& te);
 
     //! Class for a Windows API window
-    class WFenster : public virtual ReferenceCounter
+    class NativeWindow : public virtual ReferenceCounter
     {
     private:
         HWND hWnd; //! Handle to the window
@@ -57,7 +57,7 @@ namespace Framework
         std::function<void(void*, void*)> vCloseAktion;
         std::function<void(void*, void*)> nCloseAktion;
         TastaturAktion tastaturAktion;
-        Bildschirm* screen;
+        Screen* screen;
         int mx, my;
         bool verschiebbar;
         HWND rahmen;
@@ -66,13 +66,13 @@ namespace Framework
 
     public:
         //--Constructor--
-        DLLEXPORT WFenster();
+        DLLEXPORT NativeWindow();
         //--Constructor--
         //! \param hwnd A handle to the window that should be managed by this
         //! class
-        DLLEXPORT WFenster(HWND hWnd);
+        DLLEXPORT NativeWindow(HWND hWnd);
         //--Destructor--
-        DLLEXPORT ~WFenster();
+        DLLEXPORT ~NativeWindow();
         //! Creates the window
         //! \param style The style of the window. Example: WS_OVERLAPPEDWINDOW
         //! (for a normal window) \param wc The Windows API window class from
@@ -114,7 +114,7 @@ namespace Framework
         //! Sets the screen object used to forward keyboard and mouse input
         //! to the framework's objects. Must be called with 0 before the
         //! window is destroyed. \param screen The screen object
-        DLLEXPORT void setBildschirm(Bildschirm* screen);
+        DLLEXPORT void setScreen(Screen* screen);
         //! Destroys the window
         DLLEXPORT void zerstoeren();
         //! Processes mouse messages. Calls MausAktion and forwards events
@@ -129,7 +129,7 @@ namespace Framework
         //! events to the screen with objects if TastaturAktion returns 1
         //! \param me The event triggered by the keyboard input
         DLLEXPORT void doTastaturAktion(TastaturEreignis& et);
-        //! Makes the window frame visible if ladeRahmenFenster was called
+        //! Makes the window frame visible if loadBorderWindow was called
         DLLEXPORT void doRestoreMessage();
         //! Sets the parameter passed to the callback function on a mouse event
         //! \param p The parameter
@@ -162,19 +162,19 @@ namespace Framework
         DLLEXPORT void setTastaturAktion(TastaturAktion ak);
         //! Sets the handle to the window that should be managed by this class
         //! \param hwnd The handle
-        DLLEXPORT void setFensterHandle(HWND hWnd);
+        DLLEXPORT void setWindowHandle(HWND hWnd);
         //! Specifies whether the window can be moved by dragging with the mouse
         //! \param verschiebbar 1 if the window may be moved
         DLLEXPORT void setVerschiebbar(bool verschiebbar);
         //! Sets a transparent frame around the window
-        //! \param zBild An image containing the frame
+        //! \param zImage An image containing the frame
         //! \param hins The HINSTANCE of the program (passed by the Framework to
         //! the start function in the Startparam structure)
-        DLLEXPORT void ladeRahmenFenster(Bild* zBild,
+        DLLEXPORT void loadBorderWindow(Image* zImage,
             HINSTANCE
                 hinst); //! sets a transparent frame around the window
         //! Returns the handle of the managed window
-        DLLEXPORT HWND getFensterHandle() const;
+        DLLEXPORT HWND getWindowHandle() const;
         //! Returns the position of the window in pixels
         DLLEXPORT Punkt getPosition() const;
         //! Returns the size of the window in pixels
@@ -197,34 +197,34 @@ namespace Framework
         //! was set
         DLLEXPORT bool hatTastaturAktion() const;
         //! Returns the screen to whose drawings the events are forwarded
-        DLLEXPORT Bildschirm* getBildschirm() const;
+        DLLEXPORT Screen* getScreen() const;
         //! Returns the screen without increased reference counter to whose
         //! drawings the events are forwarded
-        DLLEXPORT Bildschirm* zBildschirm() const;
+        DLLEXPORT Screen* zScreen() const;
         //! Returns whether the window is movable
         DLLEXPORT bool istVerschiebbar() const;
     };
 
     //! Manages all Windows API windows in the framework
-    class WFensterArray
+    class NativeWindowArray
     {
     private:
-        WFensterArray* next;
-        WFenster* This;
+        NativeWindowArray* next;
+        NativeWindow* This;
 
     public:
         //! Constructor
-        DLLEXPORT WFensterArray();
+        DLLEXPORT NativeWindowArray();
         //! Destructor
-        DLLEXPORT ~WFensterArray();
+        DLLEXPORT ~NativeWindowArray();
         //! Adds a new window
         //! \param fenster The window
-        DLLEXPORT bool addFenster(WFenster* fenster);
+        DLLEXPORT bool addWindow(NativeWindow* fenster);
         //! Removes a window
         //! \param fenster The window
-        DLLEXPORT bool removeFenster(WFenster* fenster);
+        DLLEXPORT bool removeWindow(NativeWindow* fenster);
         //! Returns the next element
-        DLLEXPORT WFensterArray* getNext();
+        DLLEXPORT NativeWindowArray* getNext();
         //! Sets the next element to 0
         DLLEXPORT void setNext0();
         //! Deletes the element
@@ -247,7 +247,7 @@ namespace Framework
         //! window \param hWnd The handle to the window
         DLLEXPORT bool sendRestoreMessage(HWND hwnd);
         //! Returns the window of this entry
-        DLLEXPORT WFenster* getThis();
+        DLLEXPORT NativeWindow* getThis();
     };
 
     //! Creates a Windows API popup window with a message
@@ -260,7 +260,7 @@ namespace Framework
         HWND hWnd, Text* titel, Text* meldung, UINT style);
 #endif
     //! Window class in the program
-    class Fenster : public Drawable
+    class Window : public Drawable
     {
     public:
         class Style : public Drawable::Style
@@ -272,7 +272,7 @@ namespace Framework
             //! the body background
             static const __int64 BodyHAlpha = 0x000000010;
             //! Determines whether an image is used as the body background
-            static const __int64 BodyHBild = 0x000000020;
+            static const __int64 BodyHImage = 0x000000020;
             //! Determines whether the body has a color gradient
             static const __int64 BodyBuffered = 0x000000040;
             //! Determines whether the window has a title bar
@@ -283,7 +283,7 @@ namespace Framework
             //! the title background
             static const __int64 TitelHAlpha = 0x000000200;
             //! Determines whether an image is used for the title background
-            static const __int64 TitelHBild = 0x000000400;
+            static const __int64 TitelHImage = 0x000000400;
             //! Determines whether the title bar has a color gradient
             static const __int64 TitelBuffered = 0x000000800;
             //! Determines whether a close button is displayed in the title bar
@@ -294,7 +294,7 @@ namespace Framework
             //! the close button background
             static const __int64 ClosingHAlpha = 0x000004000;
             //! Determines whether an image is used for the close button background
-            static const __int64 ClosingHBild = 0x000008000;
+            static const __int64 ClosingHImage = 0x000008000;
             //! Determines whether the close button has a color gradient
             static const __int64 ClosingBuffer = 0x000010000;
             //! Determines whether the close button has a color gradient
@@ -336,7 +336,7 @@ namespace Framework
             //! drawings behind the window
             static const __int64 METransparenz = 0x100000000;
             //! Determines whether the window has a border
-            static const __int64 Rahmen = 0x200000000;
+            static const __int64 Border = 0x200000000;
             //! Determines whether the left side of the window is fixed when
             //! the size is changeable
             static const __int64 LeftPositionFixed = 0x400000000;
@@ -370,8 +370,8 @@ namespace Framework
             //! TitleBuffered, Closable, ClosingImage, ClosingClickBuffer,
             //! Movable
             static const __int64 normal
-                = Sichtbar | Erlaubt | Rahmen | Titel | TitelBuffered | Closable
-                | ClosingHBild | ClosingKlickBuffer | Beweglich
+                = Sichtbar | Erlaubt | Border | Titel | TitelBuffered | Closable
+                | ClosingHImage | ClosingKlickBuffer | Beweglich
                 | MEIgnoreVerarbeitet | MEIgnoreSichtbar | MEIgnoreParentInside
                 | MEIgnoreInside;
         };
@@ -379,14 +379,14 @@ namespace Framework
     private:
         MausAktion closingMe;
         void* closingMeParam;
-        Rahmen* rahmen;
-        TextFeld* titel;
+        Border* rahmen;
+        TextField* titel;
         RCArray<Drawable>* members;
         int bgBodyColor;
-        Bild* bgBodyPicture;
+        Image* bgBodyPicture;
         AlphaFeld* bodyBuffer;
         int bgClosingFarbe;
-        Bild* bgClosingBild;
+        Image* bgClosingImage;
         AlphaFeld* closeBuffer;
         AlphaFeld* closeKlickBuffer;
         VScrollBar* vScroll;
@@ -404,12 +404,12 @@ namespace Framework
 
     public:
         //! Constructor
-        DLLEXPORT Fenster();
+        DLLEXPORT Window();
         //! Destructor
-        DLLEXPORT virtual ~Fenster();
+        DLLEXPORT virtual ~Window();
         //! Sets a pointer to the window border
         //! \param ram The border
-        DLLEXPORT void setRahmenZ(Rahmen* ram);
+        DLLEXPORT void setBorderZ(Border* ram);
         //! Sets the color of the window border
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setRFarbe(int f);
@@ -425,12 +425,12 @@ namespace Framework
         //! Sets the title of the window
         //! \param txt The text
         DLLEXPORT void setTitel(const char* txt);
-        //! Sets a pointer to the TextFeld that draws the title text
-        //! \param tf The TextFeld
-        DLLEXPORT void setTTextFeldZ(TextFeld* tf);
+        //! Sets a pointer to the TextField that draws the title text
+        //! \param tf The TextField
+        DLLEXPORT void setTTextFeldZ(TextField* tf);
         //! Sets the font used for the title
         //! \param schrift The font
-        DLLEXPORT void setTSchriftZ(Schrift* schrift);
+        DLLEXPORT void setTFontZ(Font* schrift);
         //! Sets the color of the font used for the title
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setTSFarbe(int f);
@@ -451,13 +451,13 @@ namespace Framework
         DLLEXPORT void setTAfStrength(int st);
         //! Sets the background image of the title by copying
         //! \param b The image to copy
-        DLLEXPORT void setTBgBild(Bild* b);
+        DLLEXPORT void setTBgImage(Image* b);
         //! Sets a pointer to the background image of the title
         //! \param b The image
-        DLLEXPORT void setTBgBildZ(Bild* b);
+        DLLEXPORT void setTBgImageZ(Image* b);
         //! Sets a pointer to the border of the title
         //! \param ram The border
-        DLLEXPORT void setTRahmenZ(Rahmen* ram);
+        DLLEXPORT void setTBorderZ(Border* ram);
         //! Sets the color of the border of the title
         //! \param f The color in A8R8G8B8 format
         DLLEXPORT void setTRFarbe(int f);
@@ -469,10 +469,10 @@ namespace Framework
         DLLEXPORT void setKBgFarbe(int f);
         //! Sets the background image of the body by copying
         //! \param b The image to copy
-        DLLEXPORT void setKBgBild(Bild* b);
+        DLLEXPORT void setKBgImage(Image* b);
         //! Sets a pointer to the background image of the body
         //! \param b The image
-        DLLEXPORT void setKBgBildZ(Bild* b);
+        DLLEXPORT void setKBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the body
         //! \param af The color gradient
         DLLEXPORT void setKAlphaFeldZ(AlphaFeld* af);
@@ -489,7 +489,7 @@ namespace Framework
         //! a mouse event. If the callback returns 0 or was not set, the mouse
         //! event is not further processed by the drawing. The window is not
         //! closed automatically but should be closed in the callback by calling
-        //! removeStyle( Fenster::Style::Sichtbar );
+        //! removeStyle( Window::Style::Sichtbar );
         //! \param ak A pointer to the callback function
         DLLEXPORT void setClosingMe(MausAktion closingMe);
         //! Sets the background color of the close button
@@ -497,10 +497,10 @@ namespace Framework
         DLLEXPORT void setSBgFarbe(int f);
         //! Sets the background image of the close button by copying
         //! \param b The image to copy
-        DLLEXPORT void setSBgBild(Bild* b);
+        DLLEXPORT void setSBgImage(Image* b);
         //! Sets a pointer to the background image of the close button
         //! \param b The image
-        DLLEXPORT void setSBgBildZ(Bild* b);
+        DLLEXPORT void setSBgImageZ(Image* b);
         //! Sets a pointer to the color gradient of the close button
         //! \param af The color gradient
         DLLEXPORT void setSAlphaFeldZ(AlphaFeld* af);
@@ -592,15 +592,15 @@ namespace Framework
         DLLEXPORT void doTastaturEreignis(TastaturEreignis& te) override;
         //! Draws the window to zRObj if it is visible
         //! \param zRObj The image to draw into
-        DLLEXPORT void render(Bild& zRObj) override;
+        DLLEXPORT void render(Image& zRObj) override;
         //! Returns the inner width of the drawing in pixels
         DLLEXPORT int getInnenBreite() const override;
         //! Returns the inner height of the drawing in pixels
         DLLEXPORT int getInnenHeight() const override;
         //! Returns the border of the window
-        DLLEXPORT Rahmen* getRahmen() const;
+        DLLEXPORT Border* getBorder() const;
         //! Returns the border of the window without increased reference counter
-        DLLEXPORT Rahmen* zRahmen() const;
+        DLLEXPORT Border* zBorder() const;
         //! Returns the color of the window border in A8R8G8B8 format
         DLLEXPORT int getRFarbe() const;
         //! Returns the width of the window border in pixels
@@ -609,15 +609,15 @@ namespace Framework
         DLLEXPORT Text* getTitel() const;
         //! Returns the title of the window without increased reference counter
         DLLEXPORT Text* zTitel() const;
-        //! Returns the TextFeld used to draw the title
-        DLLEXPORT TextFeld* getTTextFeld() const;
-        //! Returns the TextFeld without increased reference counter used
+        //! Returns the TextField used to draw the title
+        DLLEXPORT TextField* getTTextField() const;
+        //! Returns the TextField without increased reference counter used
         //! to draw the title
-        DLLEXPORT TextFeld* zTTextFeld() const;
+        DLLEXPORT TextField* zTTextField() const;
         //! Returns the font used for the title
-        DLLEXPORT Schrift* getTSchrift() const;
+        DLLEXPORT Font* getTFont() const;
         //! Returns the font without increased reference counter used for the title
-        DLLEXPORT Schrift* zTSchrift() const;
+        DLLEXPORT Font* zTFont() const;
         //! Returns the font color of the title in A8R8G8B8 format
         DLLEXPORT int getTSFarbe() const;
         //! Returns the height of a line of the title in pixels
@@ -633,13 +633,13 @@ namespace Framework
         //! Returns the strength of the color gradient of the title
         DLLEXPORT int getTAfStrength() const;
         //! Returns the background image of the title
-        DLLEXPORT Bild* getTBgBild() const;
+        DLLEXPORT Image* getTBgImage() const;
         //! Returns the background image of the title without increased reference counter
-        DLLEXPORT Bild* zTBgBild() const;
+        DLLEXPORT Image* zTBgImage() const;
         //! Returns the border of the title
-        DLLEXPORT Rahmen* getTRahmen() const;
+        DLLEXPORT Border* getTBorder() const;
         //! Returns the border of the title without increased reference counter
-        DLLEXPORT Rahmen* zTRahmen() const;
+        DLLEXPORT Border* zTBorder() const;
         //! Returns the color of the title border in A8R8G8B8 format
         DLLEXPORT int getTRFarbe() const;
         //! Returns the width of the title border
@@ -647,9 +647,9 @@ namespace Framework
         //! Returns the background color of the body
         DLLEXPORT int getKBgFarbe() const;
         //! Returns the background image of the body
-        DLLEXPORT Bild* getKBgBild() const;
+        DLLEXPORT Image* getKBgImage() const;
         //! Returns the background image of the body without increased reference counter
-        DLLEXPORT Bild* zKBgBild() const;
+        DLLEXPORT Image* zKBgImage() const;
         //! Returns the color gradient of the body
         DLLEXPORT AlphaFeld* getKAlphaFeld() const;
         //! Returns the color gradient of the body without increased reference counter
@@ -661,10 +661,10 @@ namespace Framework
         //! Returns the background color of the close button in A8R8G8B8 format
         DLLEXPORT int getSBgFarbe() const;
         //! Returns the background image of the close button
-        DLLEXPORT Bild* getSBgBild() const;
+        DLLEXPORT Image* getSBgImage() const;
         //! Returns the background image of the close button without increased
         //! reference counter
-        DLLEXPORT Bild* zSBgBild() const;
+        DLLEXPORT Image* zSBgImage() const;
         //! Returns the color gradient of the close button
         DLLEXPORT AlphaFeld* getSAlphaFeld() const;
         //! Returns the color gradient of the close button without increased

World2D.cpp

@@ -418,7 +418,7 @@ bool Welt2D::tick(double zeit)
 
 void Welt2D::render(Mat3<float>& kamMat,
     Punkt size,
-    Bild& zRObj,
+    Image& zRObj,
     int xOffset,
     int yOffset,
     const char* kamName)
@@ -448,7 +448,7 @@ void Welt2D::render(Mat3<float>& kamMat,
 }
 
 void Welt2D::render(
-    Mat3<float>& kamMat, Punkt size, Bild& zRObj, const char* kamName)
+    Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName)
 {
     if (!info.hasSize || !info.circular)
     {

World2D.h

@@ -11,7 +11,7 @@
 namespace Framework
 {
     typedef Vec2<float> Vertex;
-    class Bild;
+    class Image;
 
     struct WeltInfo
     {
@@ -92,7 +92,7 @@ namespace Framework
         //! to draw into \param ignoreTransparentFlag if 1, collisions with
         //! transparent polygons are also considered
         virtual void render(
-            Mat3<float>& kamMat, Bild& zRObj, const char* ignoreTransparentFlag)
+            Mat3<float>& kamMat, Image& zRObj, const char* ignoreTransparentFlag)
             = 0;
         //! Returns whether a point is inside the object
         //! \param p The point
@@ -174,7 +174,7 @@ namespace Framework
 
         void render(Mat3<float>& kamMat,
             Punkt size,
-            Bild& zRObj,
+            Image& zRObj,
             int xOffset,
             int yOffset,
             const char* kamName);
@@ -198,7 +198,7 @@ namespace Framework
         DLLEXPORT void impuls(Vertex worldPos, Vertex worldDir);
         DLLEXPORT bool tick(double zeit);
         DLLEXPORT void render(
-            Mat3<float>& kamMat, Punkt size, Bild& zRObj, const char* kamName);
+            Mat3<float>& kamMat, Punkt size, Image& zRObj, const char* kamName);
         DLLEXPORT const WeltInfo& getWorldInfo() const;
         DLLEXPORT ArrayIterator<Object2D*> getMembers();
     };