不韋 呂 / BUTTON_GROUP

Class library: Button class and ButtonGroup class for DISCO-F746NG. クラスライブラリ： DISCO-F746NG 用の，Button クラス，ButtonGroup クラス．

Dependents:   F746_SpectralAnalysis_NoPhoto F746_Fourier_series_of_square_wave_01 F746_ButtonGroup_Demo F746_Mandelbrot ... more

Diff: button_group.hpp

Revision:
10:5ca60e724a76
Parent:
6:d268555e2f50
Child:
11:204bc17f59cc
--- a/button_group.hpp	Wed Dec 23 08:00:51 2015 +0000
+++ b/button_group.hpp	Thu Dec 31 08:32:05 2015 +0000
@@ -1,7 +1,7 @@
 //-----------------------------------------------------------
 //  Button group class -- Header
 //
-//  2015/12/09, Copyright (c) 2015 MIKAMI, Naoki
+//  2015/12/31, Copyright (c) 2015 MIKAMI, Naoki
 //-----------------------------------------------------------
 
 #ifndef F746_BUTTON_GROUP_HPP
@@ -25,16 +25,16 @@
                     uint16_t column = 1,
                     sFONT &fonts = Font12,
                     uint32_t textColor = LCD_COLOR_WHITE);
-                    
+
         // Destructor
         ~ButtonGroup();
-        
+
         // Draw button
         void Draw(int num, uint32_t color,
                   uint32_t textColor = LCD_COLOR_WHITE)
         {   buttons_[num]->Draw(color, textColor);  }
 
-        // Draw all button
+        // Draw all buttons
         void DrawAll(uint32_t color,
                      uint32_t textColor = LCD_COLOR_WHITE)
         {
@@ -53,7 +53,7 @@
         // Check touch detected for specified button
         bool Touched(int num)
         {   return buttons_[num]->Touched();    }
-        
+
         // Check touch detected for specified button and redraw
         bool Touched(int num, uint32_t color,
                      uint32_t textColor = LCD_COLOR_WHITE);
@@ -63,10 +63,6 @@
 
         // Get touched number and redraw button if touched
         bool GetTouchedNumber(int &num, uint32_t color);
-        
-        // Get current color
-        uint32_t GetCurrentColor(int n)
-        {   return buttons_[n]->GetCurrentColor();  }
 
     private:
         Button **buttons_;