Reverted 9ce82dc

SwooshyCueb · Dec 1, 2013 · 6bbc80f · 6bbc80f
1 parent c59963a
commit 6bbc80f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/Revitar/RevEditor.cpp b/Revitar/RevEditor.cpp
@@ -326,7 +326,7 @@ RevEditor::RevEditor (AudioEffect *effect)
     hKnob = 0;
     hTuneKnob = 0;
     hSlideKnob = 0;
-//    hRegButton = 0;
+    hRegButton = 0;
     hVuMeter = 0;
     hWelcome = 0;
     hChordSwitch = 0;
@@ -385,17 +385,17 @@ RevEditor::~RevEditor ()
         hRoundButton->forget ();
     hRoundButton = 0;
 
-//    if (hRegButton)
-//        hRegButton->forget ();
-//    hRegButton = 0;
+    if (hRegButton)
+        hRegButton->forget ();
+    hRegButton = 0;
 
     if (hVuMeter)
         hVuMeter->forget ();
     hVuMeter = 0;
 
-    //if (hWelcome)
-    //    hWelcome->forget ();
-    //hWelcome = 0;
+    if (hWelcome)
+        hWelcome->forget ();
+    hWelcome = 0;
 
     if (hChordSwitch)
         hChordSwitch->forget ();
@@ -610,8 +610,8 @@ if (!hSquareButton)
   hSquareButton = new CBitmap (IDB_BITMAP39);
 if (!hRoundButton)
   hRoundButton = new CBitmap (IDB_BITMAP38);
-//if (!hRegButton)
-//  hRegButton = new CBitmap (REGISTER_0);
+if (!hRegButton)
+  hRegButton = new CBitmap (REGISTER_0);
 if (!hAbout)
   hAbout = new CBitmap (ABOUT_0);
 if (!hVuMeter)

diff --git a/Revitar/RevEditor.h b/Revitar/RevEditor.h
@@ -271,7 +271,7 @@ class RevEditor : public AEffGUIEditor, public CControlListener
         COnOffButton *picknoise;
 	COnOffButton *absRel;
 	CTextEdit *textReg;
-	//CSplashScreen *welcome;
+	CSplashScreen *welcome;
 	CSplashScreen *about;
 	CVuMeterCircle  *meter;
 	COptionMenu *chords;
@@ -294,9 +294,9 @@ class RevEditor : public AEffGUIEditor, public CControlListener
 	CBitmap *hSlideKnob;
 	CBitmap *hRoundButton;
 	CBitmap *hSquareButton;
-	//CBitmap *hRegButton;
+	CBitmap *hRegButton;
 	CBitmap *hVuMeter;
-	//CBitmap *hWelcome;
+	CBitmap *hWelcome;
 	CBitmap *hChordSwitch;
 	CBitmap *hAbout;
 	CBitmap *hDisplayBack;

diff --git a/Revitar/Revitar.rc b/Revitar/Revitar.rc
@@ -68,7 +68,7 @@ KNOB_SHADOW_1           BITMAP                  "res\\chromeKnob3Shadow-1.bmp"
 TUNE_KNOB_0             BITMAP                  "res\\tuneKnob0-new.bmp"
 PICK_TYPE_3             BITMAP                  "res\\pickType3.bmp"
 STOP_SWITCH_0           BITMAP                  "res\\stopSwitch.bmp"
-//REGISTER_0              BITMAP                  "res\\registerButton1.bmp"
+REGISTER_0              BITMAP                  "res\\registerButton1.bmp"
 CHORD_ON_0              BITMAP                  "res\\chordOn0.bmp"
 KNOB_SLIDE_0            BITMAP                  "res\\chromeKnob3Shadow-Slide0.bmp"
 ROCKER_SWITCH_4         BITMAP                  "res\\rockerSwitch4.bmp"

diff --git a/Revitar/res/registerButton1.bmp b/Revitar/res/registerButton1.bmp
diff --git a/Revitar/res/welcome0.bmp b/Revitar/res/welcome0.bmp
diff --git a/Revitar/resource.h b/Revitar/resource.h
@@ -79,8 +79,8 @@
 #define TUNE_KNOB_0                     170
 #define PICK_TYPE_3                     171
 #define STOP_SWITCH_0                   172
-//#define REGISTER_0                      173
-//#define WELCOME_BETA_0                  174
+#define REGISTER_0                      173
+#define WELCOME_BETA_0                  174
 #define BACKGROUND_ALL_BETA_0           175
 #define BACKGROUND_BETA_7_0             176
 #define ROCKER_SWITCH_2                 177