merged svn trunk r1837 into cmake branche

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1838 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 37 insertions, 37 deletions

diff --git a/cmake/src/menu/UMenuButton.pas b/cmake/src/menu/UMenuButton.pas
index c6ff8ab7..923f0b14 100644
--- a/cmake/src/menu/UMenuButton.pas
+++ b/cmake/src/menu/UMenuButton.pas
@@ -55,7 +55,6 @@ type
       PosX,
       PosY:         real;
 
-      constructor Create(); overload;
 
     public
       Text:                      array of TText;
@@ -113,6 +112,7 @@ type
 
       procedure   Draw; virtual;
 
+      constructor Create(); overload;
       constructor Create(Textura: TTexture); overload;
       constructor Create(Textura, DSTexture: TTexture); overload;
       destructor  Destroy; override;
@@ -252,42 +252,6 @@ begin
   end;
 end;
 
-constructor TButton.Create();
-begin
-  inherited Create;
-  // We initialize all to 0, nil or false
-  Visible        := true;
-  SelectBool     := false;
-  DeselectType   := 0;
-  Selectable     := true;
-  Reflection     := false;
-  Colorized      := false;
-
-  SelectColR     := 1;
-  SelectColG     := 1;
-  SelectColB     := 1;
-  SelectInt      := 1;
-  SelectTInt     := 1;
-
-  DeselectColR   := 1;
-  DeselectColG   := 1;
-  DeselectColB   := 1;
-  DeselectInt    := 0.5;
-  DeselectTInt   := 1;
-
-  Fade           := false;
-  FadeTex.TexNum := 0;
-  FadeProgress   := 0;
-  FadeText       := false;
-  SelectW        := DeSelectW;
-  SelectH        := DeSelectH;
-
-  PosX           := 0;
-  PosY           := 0;
-
-  Parent         := 0;
-end;
-
 // ***** Public methods ****** //
 
 procedure TButton.Draw;
@@ -571,6 +535,42 @@ begin
   inherited;
 end;
 
+constructor TButton.Create();
+begin
+  inherited Create;
+  // We initialize all to 0, nil or false
+  Visible        := true;
+  SelectBool     := false;
+  DeselectType   := 0;
+  Selectable     := true;
+  Reflection     := false;
+  Colorized      := false;
+
+  SelectColR     := 1;
+  SelectColG     := 1;
+  SelectColB     := 1;
+  SelectInt      := 1;
+  SelectTInt     := 1;
+
+  DeselectColR   := 1;
+  DeselectColG   := 1;
+  DeselectColB   := 1;
+  DeselectInt    := 0.5;
+  DeselectTInt   := 1;
+
+  Fade           := false;
+  FadeTex.TexNum := 0;
+  FadeProgress   := 0;
+  FadeText       := false;
+  SelectW        := DeSelectW;
+  SelectH        := DeSelectH;
+
+  PosX           := 0;
+  PosY           := 0;
+
+  Parent         := 0;
+end;
+
 constructor TButton.Create(Textura: TTexture);
 begin
   Create();