[JVCL-Checkins] dev/JVCL3/examples/JvTransparentButton/BCB TransBtnFormMainU.cpp,1.1,1.2 TransBtnFormMainU.dfm,1.1,1.2 TransBtnFormMainU.h,1.1,1.2 - Updated from Delphi's version TJvTransparentButton2 and TJvT

[Olivier S. <ob...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/examples/JvTransparentButton/BCB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4197/dev/JVCL3/examples/JvTransparentButton/BCB

Modified Files:
	TransBtnFormMainU.cpp TransBtnFormMainU.dfm 
	TransBtnFormMainU.h 
Log Message:
Updated from Delphi's version
TJvTransparentButton2 and TJvTransparentButton have been merged


Index: TransBtnFormMainU.h
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/JvTransparentButton/BCB/TransBtnFormMainU.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransBtnFormMainU.h	12 May 2005 16:10:42 -0000	1.1
--- TransBtnFormMainU.h	18 May 2005 19:11:03 -0000	1.2
***************
*** 50,54 ****
          TLabel *Label1;
          TLabel *Label3;
!         TJvTransparentButton2 *JvTransparentButton21;
          TPageControl *PageControl1;
          TTabSheet *TabSheet1;
--- 50,54 ----
          TLabel *Label1;
          TLabel *Label3;
!         TJvTransparentButton *JvTransparentButton21;
          TPageControl *PageControl1;
          TTabSheet *TabSheet1;
***************
*** 70,80 ****
          TTabSheet *TabSheet2;
          TImage *Image2;
!         TJvTransparentButton2 *JvTransparentButton22;
!         TJvTransparentButton2 *JvTransparentButton23;
!         TJvTransparentButton2 *JvTransparentButton24;
!         TJvTransparentButton2 *JvTransparentButton25;
!         TJvTransparentButton2 *JvTransparentButton26;
!         TJvTransparentButton2 *JvTransparentButton27;
!         TJvTransparentButton2 *JvTransparentButton28;
          TButton *Button1;
          TPopupMenu *PopupMenu1;
--- 70,80 ----
          TTabSheet *TabSheet2;
          TImage *Image2;
!         TJvTransparentButton *JvTransparentButton22;
!         TJvTransparentButton *JvTransparentButton23;
!         TJvTransparentButton *JvTransparentButton24;
!         TJvTransparentButton *JvTransparentButton25;
!         TJvTransparentButton *JvTransparentButton26;
!         TJvTransparentButton *JvTransparentButton27;
!         TJvTransparentButton *JvTransparentButton28;
          TButton *Button1;
          TPopupMenu *PopupMenu1;
***************
*** 105,110 ****
--- 105,114 ----
          void __fastcall JvTransparentButton28Click(TObject *Sender);
          void __fastcall JvTransparentButton26Click(TObject *Sender);
+         void __fastcall FormActivate(TObject *Sender);
+         void __fastcall FormKeyPress(TObject *Sender, char &Key);
+         void __fastcall PageControl1Change(TObject *Sender);
  private:
          AnsiString GetOS(void);	// User declarations
+         bool Activated;
  public:		// User declarations
          __fastcall TTransBtnFormMain(TComponent* Owner);

Index: TransBtnFormMainU.cpp
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/JvTransparentButton/BCB/TransBtnFormMainU.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransBtnFormMainU.cpp	12 May 2005 16:10:42 -0000	1.1
--- TransBtnFormMainU.cpp	18 May 2005 19:11:03 -0000	1.2
***************
*** 139,140 ****
--- 139,167 ----
  }
  //---------------------------------------------------------------------------
+ void __fastcall TTransBtnFormMain::FormActivate(TObject *Sender)
+ {
+   if (!Activated)
+   {
+     Activated = True;
+     Image2->Picture->Assign(Image3->Picture);
+   }
+ }
+ //---------------------------------------------------------------------------
+ 
+ void __fastcall TTransBtnFormMain::FormKeyPress(TObject *Sender, char &Key)
+ {
+   if (Key == 13)
+   {
+     Key = 0;
+     TransparentButton1->OnClick(NULL);
+   }
+ }
+ //---------------------------------------------------------------------------
+ 
+ 
+ void __fastcall TTransBtnFormMain::PageControl1Change(TObject *Sender)
+ {
+   Invalidate();        
+ }
+ //---------------------------------------------------------------------------
+ 

Index: TransBtnFormMainU.dfm
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/examples/JvTransparentButton/BCB/TransBtnFormMainU.dfm,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransBtnFormMainU.dfm	12 May 2005 16:10:42 -0000	1.1
--- TransBtnFormMainU.dfm	18 May 2005 19:11:03 -0000	1.2
***************
*** 1,9 ****
  object TransBtnFormMain: TTransBtnFormMain
!   Left = 164
    Top = 182
!   Width = 538
!   Height = 379
    Caption = 'TransparentButton Example Program'
    Color = clBtnFace
    Font.Charset = DEFAULT_CHARSET
    Font.Color = clWindowText
--- 1,12 ----
  object TransBtnFormMain: TTransBtnFormMain
!   Left = 430
    Top = 182
!   BorderIcons = [biSystemMenu, biMinimize, biHelp]
!   BorderStyle = bsSingle
    Caption = 'TransparentButton Example Program'
+   ClientHeight = 355
+   ClientWidth = 528
    Color = clBtnFace
+   DefaultMonitor = dmDesktop
    Font.Charset = DEFAULT_CHARSET
    Font.Color = clWindowText
***************
*** 11,15 ****
    Font.Name = 'MS Sans Serif'
    Font.Style = []
!   OldCreateOrder = False
    PixelsPerInch = 96
    TextHeight = 13
--- 14,22 ----
    Font.Name = 'MS Sans Serif'
    Font.Style = []
!   OldCreateOrder = True
!   Position = poDesktopCenter
!   Scaled = False
!   OnActivate = FormActivate
!   OnKeyPress = FormKeyPress
    PixelsPerInch = 96
    TextHeight = 13
***************
*** 36,40 ****
      Transparent = True
    end
!   object JvTransparentButton21: TJvTransparentButton2
      Left = 224
      Top = 224
--- 43,47 ----
      Transparent = True
    end
!   object JvTransparentButton21: TJvTransparentButton
      Left = 224
      Top = 224
***************
*** 57,60 ****
--- 64,68 ----
      Anchors = [akLeft, akTop, akRight, akBottom]
      TabOrder = 0
+     OnChange = PageControl1Change
      object TabSheet1: TTabSheet
        Caption = 'TransparentButtons (using Glyphs)'
***************
*** 1871,1874 ****
--- 1879,1891 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ParentFont = False
+         Spacing = 0
+         TextAlign = ttaBottom
+         WordWrap = True
+         OnClick = TransparentButton1Click
+         OnMouseDown = TransparentButton1MouseDown
+         OnMouseUp = TransparentButton1MouseUp
+         OnMouseEnter = TransparentButton1MouseEnter
+         OnMouseLeave = TransparentButton1MouseLeave
          Glyph.Data = {
            72010000424D7201000000000000760000002800000015000000150000000100
***************
*** 1884,1896 ****
            7066666660000FFFFFFFFFF7706CC6CC60000000000000000066666660006666
            66666666666666666000666666666666666666666000}
-         ParentFont = False
-         Spacing = 0
-         TextAlign = ttaBottom
-         WordWrap = True
-         OnClick = TransparentButton1Click
-         OnMouseDown = TransparentButton1MouseDown
-         OnMouseUp = TransparentButton1MouseUp
-         OnMouseEnter = TransparentButton1MouseEnter
-         OnMouseLeave = TransparentButton1MouseLeave
        end
        object TransparentButton2: TJvTransparentButton
--- 1901,1904 ----
***************
*** 1908,1911 ****
--- 1916,1921 ----
          HotTrackFont.Style = []
          FrameStyle = fsIndent
+         Spacing = 8
+         TextAlign = ttaLeft
          Glyph.Data = {
            72010000424D7201000000000000760000002800000015000000150000000100
***************
*** 1921,1926 ****
            6666555560006666660777066666565560006666666000666666666560006666
            66666666666666656000666666666666666666566000}
-         Spacing = 8
-         TextAlign = ttaLeft
        end
        object TransparentButton3: TJvTransparentButton
--- 1931,1934 ----
***************
*** 1942,1945 ****
--- 1950,1960 ----
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
+         ParentFont = False
+         ParentShowHint = False
+         ShowHint = True
+         Spacing = 5
+         TextAlign = ttaBottom
+         WordWrap = True
+         OnClick = TransparentButton3Click
          Glyph.Data = {
            46160000424D4616000000000000360400002800000088000000220000000100
***************
*** 2123,2133 ****
            0B0B0B0B0B0B0B0B0B0B}
          NumGlyphs = 4
-         ParentFont = False
-         ParentShowHint = False
-         ShowHint = True
-         Spacing = 5
-         TextAlign = ttaBottom
-         WordWrap = True
-         OnClick = TransparentButton3Click
        end
        object TransparentButton7: TJvTransparentButton
--- 2138,2141 ----
***************
*** 2143,2146 ****
--- 2151,2155 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         PressOffset = 2
          Glyph.Data = {
            C20C0000424DC20C000000000000420000002800000031000000200000000100
***************
*** 2247,2251 ****
            F85EF85EF85EF85E1863F85EF85E18631863F85E1863F762186318631863F762
            186318630000}
-         Offset = 2
        end
        object TransparentButton8: TJvTransparentButton
--- 2256,2259 ----
***************
*** 2261,2264 ****
--- 2269,2273 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         PressOffset = 2
          Glyph.Data = {
            C20C0000424DC20C000000000000420000002800000031000000200000000100
***************
*** 2365,2369 ****
            F85EF85EF85EF85E1863F85EF85E18631863F85E1863F762186318631863F762
            186318630000}
-         Offset = 2
        end
        object TransparentButton9: TJvTransparentButton
--- 2374,2377 ----
***************
*** 2385,2388 ****
--- 2393,2398 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ParentFont = False
+         PressOffset = 2
          Glyph.Data = {
            321F0000424D321F00000000000042000000280000006E000000240000000100
***************
*** 2636,2641 ****
            1863186318631863186318631863186318631863186318631863186318631863
            18631863186318631863186318631863186318631863}
-         Offset = 2
-         ParentFont = False
        end
        object TransparentButton6: TJvTransparentButton
--- 2646,2649 ----
***************
*** 2646,2650 ****
          AllowAllUp = True
          Caption = 'OS'
-         GroupIndex = 2
          HotTrackFont.Charset = DEFAULT_CHARSET
          HotTrackFont.Color = clWindowText
--- 2654,2657 ----
***************
*** 2652,2655 ****
--- 2659,2666 ----
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
+         Spacing = 5
+         TextAlign = ttaBottom
+         Transparent = False
+         OnClick = TransparentButton6Click
          Glyph.Data = {
            16020000424D160200000000000076000000280000001A0000001A0000000100
***************
*** 2670,2677 ****
            EEEEEEEEEEEEEE000000EEEEEEEEEEEEEEEEEEEEEEEEEE000000EEEEEEEEEEEE
            EEEEEEEEEEEEEE000000EEEEEEEEEEEEEEEEEEEEEEEEEE000000}
-         Spacing = 5
-         TextAlign = ttaBottom
-         Transparent = False
-         OnClick = TransparentButton6Click
        end
        object TransparentButton10: TJvTransparentButton
--- 2681,2684 ----
***************
*** 2682,2686 ****
          AllowAllUp = True
          Caption = 'Down / not Down'
-         GroupIndex = 1
          HotTrackFont.Charset = DEFAULT_CHARSET
          HotTrackFont.Color = clWindowText
--- 2689,2692 ----
***************
*** 2689,2692 ****
--- 2695,2703 ----
          HotTrackFont.Style = []
          FrameStyle = fsIndent
+         Spacing = 6
+         TextAlign = ttaBottom
+         Transparent = False
+         WordWrap = True
+         OnClick = TransparentButton10Click
          Glyph.Data = {
            B6010000424DB60100000000000076000000280000001E000000140000000100
***************
*** 2704,2712 ****
            BB0BB0090DDDDDDDDD00DDDDDDDDDDDD0BBB0D090DDDDDDDDD00DDDDDDDDDDDD
            D0B0DD090DDDDDDDDD00DDDDDDDDDDDDDD0DDD000DDDDDDDDD00}
-         Spacing = 6
-         TextAlign = ttaBottom
-         Transparent = False
-         WordWrap = True
-         OnClick = TransparentButton10Click
        end
        object TransparentButton11: TJvTransparentButton
--- 2715,2718 ----
***************
*** 2723,2726 ****
--- 2729,2735 ----
          HotTrackFont.Style = []
          FrameStyle = fsIndent
+         PopupMenu = PopupMenu1
+         Spacing = 6
+         TextAlign = ttaTop
          Glyph.Data = {
            F6000000424DF600000000000000760000002800000010000000100000000100
***************
*** 2732,2741 ****
            B0BAA0CCAAAAAAAAAAAAA0000AB0B0A88888A0220CAAAA888A88A0220000A888
            8A88A0220CC0A88AAAAAA0000000A8888A88AAAAAAAAA8888A88}
-         PopupMenu = PopupMenu1
-         Spacing = 6
-         TextAlign = ttaTop
        end
        object TransparentButton5: TJvTransparentButton
!         Left = 98
          Top = 105
          Width = 63
--- 2741,2747 ----
            B0BAA0CCAAAAAAAAAAAAA0000AB0B0A88888A0220CAAAA888A88A0220000A888
            8A88A0220CC0A88AAAAAA0000000A8888A88AAAAAAAAA8888A88}
        end
        object TransparentButton5: TJvTransparentButton
!         Left = 96
          Top = 105
          Width = 63
***************
*** 2749,2752 ****
--- 2755,2760 ----
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
+         Spacing = 6
+         TextAlign = ttaTop
          Glyph.Data = {
            B6010000424DB60100000000000076000000280000001E000000140000000100
***************
*** 2764,2769 ****
            1FF080DDDDDDDDDDDD000F81818181818FF080DDDDDDDDDDDD000FFFFFFFFFFF
            FFF000DDDDDDDDDDDD000000000000000000DDDDDDDDDDDDDD00}
-         Spacing = 6
-         TextAlign = ttaTop
        end
        object TransparentButton15: TJvTransparentButton
--- 2772,2775 ----
***************
*** 2779,2782 ****
--- 2785,2790 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ShowPressed = False
+         TextAlign = ttaBottom
          Glyph.Data = {
            46160000424D4616000000000000360400002800000088000000220000000100
***************
*** 2960,2965 ****
            0B0B0B0B0B0B0B0B0B0B}
          NumGlyphs = 4
-         ShowPressed = False
-         TextAlign = ttaBottom
        end
        object TransparentButton12: TJvTransparentButton
--- 2968,2971 ----
***************
*** 2975,2978 ****
--- 2981,2986 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ShowPressed = False
+         TextAlign = ttaBottom
          Glyph.Data = {
            46160000424D4616000000000000360400002800000088000000220000000100
***************
*** 3156,3161 ****
            0B0B0B0B0B0B0B0B0B0B}
          NumGlyphs = 4
-         ShowPressed = False
-         TextAlign = ttaBottom
        end
        object TransparentButton13: TJvTransparentButton
--- 3164,3167 ----
***************
*** 3171,3174 ****
--- 3177,3182 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ShowPressed = False
+         TextAlign = ttaBottom
          Glyph.Data = {
            46160000424D4616000000000000360400002800000088000000220000000100
***************
*** 3352,3357 ****
            0B0B0B0B0B0B0B0B0B0B}
          NumGlyphs = 4
-         ShowPressed = False
-         TextAlign = ttaBottom
        end
        object TransparentButton14: TJvTransparentButton
--- 3360,3363 ----
***************
*** 3367,3370 ****
--- 3373,3378 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
+         ShowPressed = False
+         TextAlign = ttaBottom
          Glyph.Data = {
            46160000424D4616000000000000360400002800000088000000220000000100
***************
*** 3548,3553 ****
            0B0B0B0B0B0B0B0B0B0B}
          NumGlyphs = 4
-         ShowPressed = False
-         TextAlign = ttaBottom
        end
      end
--- 3556,3559 ----
***************
*** 3563,3567 ****
          Stretch = True
        end
!       object JvTransparentButton22: TJvTransparentButton2
          Left = 8
          Top = 8
--- 3569,3573 ----
          Stretch = True
        end
!       object JvTransparentButton22: TJvTransparentButton
          Left = 8
          Top = 8
***************
*** 3575,3583 ****
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
-         ActiveImage = ImageList1
-         ActiveIndex = 0
          Transparent = False
        end
!       object JvTransparentButton23: TJvTransparentButton2
          Left = 56
          Top = 8
--- 3581,3589 ----
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
          Transparent = False
+         Images.ActiveImage = ImageList1
+         Images.ActiveIndex = 0
        end
!       object JvTransparentButton23: TJvTransparentButton
          Left = 56
          Top = 8
***************
*** 3592,3599 ****
          HotTrackFont.Style = []
          FrameStyle = fsIndent
!         ActiveImage = ImageList1
!         ActiveIndex = 1
        end
!       object JvTransparentButton24: TJvTransparentButton2
          Left = 104
          Top = 8
--- 3598,3605 ----
          HotTrackFont.Style = []
          FrameStyle = fsIndent
!         Images.ActiveImage = ImageList1
!         Images.ActiveIndex = 1
        end
!       object JvTransparentButton24: TJvTransparentButton
          Left = 104
          Top = 8
***************
*** 3608,3615 ****
          HotTrackFont.Style = []
          FrameStyle = fsLight
!         ActiveImage = ImageList1
!         ActiveIndex = 2
        end
!       object JvTransparentButton25: TJvTransparentButton2
          Left = 152
          Top = 8
--- 3614,3621 ----
          HotTrackFont.Style = []
          FrameStyle = fsLight
!         Images.ActiveImage = ImageList1
!         Images.ActiveIndex = 2
        end
!       object JvTransparentButton25: TJvTransparentButton
          Left = 152
          Top = 8
***************
*** 3623,3630 ****
          HotTrackFont.Style = []
          FrameStyle = fsMono
!         ActiveImage = ImageList1
!         ActiveIndex = 3
        end
!       object JvTransparentButton26: TJvTransparentButton2
          Left = 296
          Top = 8
--- 3629,3636 ----
          HotTrackFont.Style = []
          FrameStyle = fsMono
!         Images.ActiveImage = ImageList1
!         Images.ActiveIndex = 3
        end
!       object JvTransparentButton26: TJvTransparentButton
          Left = 296
          Top = 8
***************
*** 3632,3636 ****
          Height = 40
          AllowAllUp = True
-         GroupIndex = 1
          HotTrackFont.Charset = DEFAULT_CHARSET
          HotTrackFont.Color = clWindowText
--- 3638,3641 ----
***************
*** 3638,3648 ****
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
-         ActiveImage = ImageList1
-         ActiveIndex = 6
-         DisabledIndex = 1
          OnClick = JvTransparentButton26Click
        end
!       object JvTransparentButton27: TJvTransparentButton2
!         Left = 198
          Top = 8
          Width = 40
--- 3643,3652 ----
          HotTrackFont.Name = 'MS Sans Serif'
          HotTrackFont.Style = []
          OnClick = JvTransparentButton26Click
+         Images.ActiveImage = ImageList1
+         Images.ActiveIndex = 6
        end
!       object JvTransparentButton27: TJvTransparentButton
!         Left = 200
          Top = 8
          Width = 40
***************
*** 3655,3669 ****
          HotTrackFont.Style = []
          FrameStyle = fsNone
!         ActiveImage = ImageList1
!         ActiveIndex = 4
!         GrayImage = ImageList1
!         GrayIndex = 11
!         DisabledImage = ImageList1
!         DisabledIndex = 15
!         DownImage = ImageList1
!         DownIndex = 10
        end
!       object JvTransparentButton28: TJvTransparentButton2
!         Left = 250
          Top = 8
          Width = 40
--- 3659,3673 ----
          HotTrackFont.Style = []
          FrameStyle = fsNone
!         Images.ActiveImage = ImageList1
!         Images.ActiveIndex = 4
!         Images.GrayImage = ImageList1
!         Images.GrayIndex = 11
!         Images.DisabledImage = ImageList1
!         Images.DisabledIndex = 15
!         Images.DownImage = ImageList1
!         Images.DownIndex = 10
        end
!       object JvTransparentButton28: TJvTransparentButton
!         Left = 248
          Top = 8
          Width = 40
***************
*** 3676,3683 ****
          HotTrackFont.Style = []
          FrameStyle = fsRegular
-         ActiveImage = ImageList1
-         ActiveIndex = 5
          Transparent = False
          OnClick = JvTransparentButton28Click
        end
      end
--- 3680,3687 ----
          HotTrackFont.Style = []
          FrameStyle = fsRegular
          Transparent = False
          OnClick = JvTransparentButton28Click
+         Images.ActiveImage = ImageList1
+         Images.ActiveIndex = 5
        end
      end