wxruby3 0.9.0.pre.rc.1-x64-mingw-ucrt → 0.9.0.pre.rc.3-x64-mingw-ucrt

data/samples/aui/aui.rb

@@ -72,23 +72,22 @@ class SizeReportCtrl < Wx::Control
 end
 
 class SettingsPanel < Wx::Panel
-  consts = %w[ 
-      ID_PaneBorderSize
-      ID_SashSize
-      ID_CaptionSize
-      ID_BackgroundColour
-      ID_SashColour
-      ID_InactiveCaptionColour
-      ID_InactiveCaptionGradientColour
-      ID_InactiveCaptionTextColour
-      ID_ActiveCaptionColour
-      ID_ActiveCaptionGradientColour
-      ID_ActiveCaptionTextColour
-      ID_BorderColour
-      ID_GripperColour ]
-
-  consts.each_with_index do |c, i|
-    const_set(c, 1001 + i)
+  module ID
+    include Wx::IDHelper
+
+    PaneBorderSize = self.next_id
+    SashSize = self.next_id
+    CaptionSize = self.next_id
+    BackgroundColour = self.next_id
+    SashColour = self.next_id
+    InactiveCaptionColour = self.next_id
+    InactiveCaptionGradientColour = self.next_id
+    InactiveCaptionTextColour = self.next_id
+    ActiveCaptionColour = self.next_id
+    ActiveCaptionGradientColour = self.next_id
+    ActiveCaptionTextColour = self.next_id
+    BorderColour = self.next_id
+    GripperColour = self.next_id
   end
 
   def initialize(parent, frame)
@@ -97,38 +96,38 @@ class SettingsPanel < Wx::Panel
     @base_bmp = create_colour_bitmap(Wx::BLACK)
 
     # set up some spin ctrls for integer variables
-    @border_size, s1 = make_metric_spin_ctrl(ID_PaneBorderSize,
+    @border_size, s1 = make_metric_spin_ctrl(ID::PaneBorderSize,
                                              "Pane Border Size:",
                                              Wx::AUI_DOCKART_PANE_BORDER_SIZE)
 
-    @sash_size, s2 = make_metric_spin_ctrl(ID_SashSize,
+    @sash_size, s2 = make_metric_spin_ctrl(ID::SashSize,
                                            "Sash Size:",
                                            Wx::AUI_DOCKART_SASH_SIZE)
 
-    @cap_size, s3 = make_metric_spin_ctrl(ID_CaptionSize,
+    @cap_size, s3 = make_metric_spin_ctrl(ID::CaptionSize,
                                           "Caption Size:",
                                           Wx::AUI_DOCKART_CAPTION_SIZE)
 
     # colour controls
-    @bckg_colour, s4 = make_colour_button(ID_BackgroundColour,
+    @bckg_colour, s4 = make_colour_button(ID::BackgroundColour,
                                           "Background Colour:")
-    @sash_colour, s5 = make_colour_button(ID_SashColour,
+    @sash_colour, s5 = make_colour_button(ID::SashColour,
                                           "Sash Colour:")
-    @capt_colour, s6 = make_colour_button(ID_InactiveCaptionColour,
+    @capt_colour, s6 = make_colour_button(ID::InactiveCaptionColour,
                                           "Normal Caption:")
-    @capt_gradnt, s7 = make_colour_button(ID_InactiveCaptionGradientColour,
+    @capt_gradnt, s7 = make_colour_button(ID::InactiveCaptionGradientColour,
                                           "Normal Caption Gradient:")
-    @capt_text, s8 = make_colour_button(ID_InactiveCaptionTextColour,
+    @capt_text, s8 = make_colour_button(ID::InactiveCaptionTextColour,
                                         "Normal Caption Text:")
-    @acap_colour, s9 = make_colour_button(ID_ActiveCaptionColour,
+    @acap_colour, s9 = make_colour_button(ID::ActiveCaptionColour,
                                           "Active Caption:")
-    @acap_gradnt, s10 = make_colour_button(ID_ActiveCaptionGradientColour,
+    @acap_gradnt, s10 = make_colour_button(ID::ActiveCaptionGradientColour,
                                            "Active Caption Gradient:")
-    @acap_text, s11 = make_colour_button(ID_ActiveCaptionTextColour,
+    @acap_text, s11 = make_colour_button(ID::ActiveCaptionTextColour,
                                          "Active Caption Text:")
-    @brdr_colour, s12 = make_colour_button(ID_BorderColour,
+    @brdr_colour, s12 = make_colour_button(ID::BorderColour,
                                            "Border Colour:")
-    @grip_colour, s13 = make_colour_button(ID_GripperColour,
+    @grip_colour, s13 = make_colour_button(ID::GripperColour,
                                            "Gripper Colour:")
 
     grid_sizer = Wx::GridSizer.new(2)
@@ -148,19 +147,19 @@ class SettingsPanel < Wx::Panel
     get_sizer.set_size_hints(self)
     update_colours
 
-    evt_spinctrl(ID_PaneBorderSize) { |e| on_pane_border_size(e) }
-    evt_spinctrl(ID_SashSize) { |e| on_sash_size(e) }
-    evt_spinctrl(ID_CaptionSize) { |e| on_caption_size(e) }
-    evt_button(ID_BackgroundColour) { |e| on_set_colour(e) }
-    evt_button(ID_SashColour) { |e| on_set_colour(e) }
-    evt_button(ID_InactiveCaptionColour) { |e| on_set_colour(e) }
-    evt_button(ID_InactiveCaptionGradientColour) { |e| on_set_colour(e) }
-    evt_button(ID_InactiveCaptionTextColour) { |e| on_set_colour(e) }
-    evt_button(ID_ActiveCaptionColour) { |e| on_set_colour(e) }
-    evt_button(ID_ActiveCaptionGradientColour) { |e| on_set_colour(e) }
-    evt_button(ID_ActiveCaptionTextColour) { |e| on_set_colour(e) }
-    evt_button(ID_BorderColour) { |e| on_set_colour(e) }
-    evt_button(ID_GripperColour) { |e| on_set_colour(e) }
+    evt_spinctrl(ID::PaneBorderSize) { |e| on_pane_border_size(e) }
+    evt_spinctrl(ID::SashSize) { |e| on_sash_size(e) }
+    evt_spinctrl(ID::CaptionSize) { |e| on_caption_size(e) }
+    evt_button(ID::BackgroundColour) { |e| on_set_colour(e) }
+    evt_button(ID::SashColour) { |e| on_set_colour(e) }
+    evt_button(ID::InactiveCaptionColour) { |e| on_set_colour(e) }
+    evt_button(ID::InactiveCaptionGradientColour) { |e| on_set_colour(e) }
+    evt_button(ID::InactiveCaptionTextColour) { |e| on_set_colour(e) }
+    evt_button(ID::ActiveCaptionColour) { |e| on_set_colour(e) }
+    evt_button(ID::ActiveCaptionGradientColour) { |e| on_set_colour(e) }
+    evt_button(ID::ActiveCaptionTextColour) { |e| on_set_colour(e) }
+    evt_button(ID::BorderColour) { |e| on_set_colour(e) }
+    evt_button(ID::GripperColour) { |e| on_set_colour(e) }
   end
 
   def update_colours()
@@ -223,25 +222,25 @@ class SettingsPanel < Wx::Panel
 
       var = nil
       case event.get_id()
-      when ID_BackgroundColour
+      when ID::BackgroundColour
         var = Wx::AUI_DOCKART_BACKGROUND_COLOUR
-      when ID_SashColour
+      when ID::SashColour
         var = Wx::AUI_DOCKART_SASH_COLOUR
-      when ID_InactiveCaptionColour
+      when ID::InactiveCaptionColour
         var = Wx::AUI_DOCKART_INACTIVE_CAPTION_COLOUR
-      when ID_InactiveCaptionGradientColour
+      when ID::InactiveCaptionGradientColour
         var = Wx::AUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR
-      when ID_InactiveCaptionTextColour
+      when ID::InactiveCaptionTextColour
         var = Wx::AUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR
-      when ID_ActiveCaptionColour
+      when ID::ActiveCaptionColour
         var = Wx::AUI_DOCKART_ACTIVE_CAPTION_COLOUR
-      when ID_ActiveCaptionGradientColour
+      when ID::ActiveCaptionGradientColour
         var = Wx::AUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR
-      when ID_ActiveCaptionTextColour
+      when ID::ActiveCaptionTextColour
         var = Wx::AUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR
-      when ID_BorderColour
+      when ID::BorderColour
         var = Wx::AUI_DOCKART_BORDER_COLOUR
-      when ID_GripperColour
+      when ID::GripperColour
         var = Wx::AUI_DOCKART_GRIPPER_COLOUR
       else
         return
@@ -307,51 +306,58 @@ class SettingsPanel < Wx::Panel
 end
 
 class AuiFrame < Wx::Frame
-  consts = %w[
-        ID_CreateTree
-        ID_CreateGrid
-        ID_CreateText
-        ID_CreateHTML
-        ID_CreateNotebook
-        ID_CreateSizeReport
-        ID_GridContent
-        ID_TextContent
-        ID_TreeContent
-        ID_HTMLContent
-        ID_NotebookContent
-        ID_SizeReportContent
-        ID_CreatePerspective
-        ID_CopyPerspectiveCode
-        ID_AllowFloating
-        ID_AllowActivePane
-        ID_TransparentHint
-        ID_VenetianBlindsHint
-        ID_RectangleHint
-        ID_NoHint
-        ID_HintFade
-        ID_NoVenetianFade
-        ID_TransparentDrag
-        ID_NoGradient
-        ID_VerticalGradient
-        ID_HorizontalGradient
-        ID_Settings
-        ID_NotebookNoCloseButton
-        ID_NotebookCloseButton
-        ID_NotebookCloseButtonAll
-        ID_NotebookCloseButtonActive
-        ID_NotebookAllowTabMove
-        ID_NotebookAllowTabExternalMove
-        ID_NotebookAllowTabSplit
-        ID_NotebookWindowList
-        ID_NotebookScrollButtons
-        ID_NotebookTabFixedWidth
-        ID_NotebookArtGloss
-        ID_NotebookArtSimple ]
-
-  consts.each_with_index do |c, i|
-    const_set(c, 2000 + i)
+  module ID
+    include Wx::IDHelper
+      CreateTree = self.next_id
+      CreateGrid = self.next_id
+      CreateText = self.next_id
+      CreateHTML = self.next_id
+      CreateNotebook = self.next_id
+      CreateSizeReport = self.next_id
+      GridContent = self.next_id
+      TextContent = self.next_id
+      TreeContent = self.next_id
+      HTMLContent = self.next_id
+      NotebookContent = self.next_id
+      SizeReportContent = self.next_id
+      CreatePerspective = self.next_id
+      CopyPerspectiveCode = self.next_id
+      AllowFloating = self.next_id
+      AllowActivePane = self.next_id
+      TransparentHint = self.next_id
+      VenetianBlindsHint = self.next_id
+      RectangleHint = self.next_id
+      NoHint = self.next_id
+      HintFade = self.next_id
+      NoVenetianFade = self.next_id
+      TransparentDrag = self.next_id
+      NoGradient = self.next_id
+      VerticalGradient = self.next_id
+      HorizontalGradient = self.next_id
+      LiveUpdate = self.next_id
+      AllowToolbarResizing = self.next_id
+      Settings = self.next_id
+      CustomizeToolbar = self.next_id
+      DropDownToolbarItem = self.next_id
+      NotebookNoCloseButton = self.next_id
+      NotebookCloseButton = self.next_id
+      NotebookCloseButtonAll = self.next_id
+      NotebookCloseButtonActive = self.next_id
+      NotebookAllowTabMove = self.next_id
+      NotebookAllowTabExternalMove = self.next_id
+      NotebookAllowTabSplit = self.next_id
+      NotebookWindowList = self.next_id
+      NotebookScrollButtons = self.next_id
+      NotebookTabFixedWidth = self.next_id
+      NotebookArtGloss = self.next_id
+      NotebookArtSimple = self.next_id
+      NotebookAlignTop = self.next_id
+      NotebookAlignBottom = self.next_id
+
+      SampleItem = self.next_id
+
+      FirstPerspective = CreatePerspective+1000
   end
-  ID_FirstPerspective = ID_CreatePerspective + 1000
 
   def initialize(*args)
     super
@@ -386,99 +392,99 @@ class AuiFrame < Wx::Frame
     file_menu.append(Wx::ID_EXIT, "Exit")
 
     view_menu = Wx::Menu.new
-    view_menu.append(ID_CreateText, "Create Text Control")
-    view_menu.append(ID_CreateHTML, "Create HTML Control")
-    view_menu.append(ID_CreateTree, "Create Tree")
-    view_menu.append(ID_CreateGrid, "Create Grid")
-    view_menu.append(ID_CreateNotebook, "Create Notebook")
-    view_menu.append(ID_CreateSizeReport, "Create Size Reporter")
+    view_menu.append(ID::CreateText, "Create Text Control")
+    view_menu.append(ID::CreateHTML, "Create HTML Control")
+    view_menu.append(ID::CreateTree, "Create Tree")
+    view_menu.append(ID::CreateGrid, "Create Grid")
+    view_menu.append(ID::CreateNotebook, "Create Notebook")
+    view_menu.append(ID::CreateSizeReport, "Create Size Reporter")
     view_menu.append_separator
 
-    view_menu.append(ID_GridContent,
+    view_menu.append(ID::GridContent,
                      "Use a Grid for the Content Pane")
-    view_menu.append(ID_TextContent,
+    view_menu.append(ID::TextContent,
                      "Use a Text Control for the Content Pane")
-    view_menu.append(ID_HTMLContent,
+    view_menu.append(ID::HTMLContent,
                      "Use an HTML Control for the Content Pane")
-    view_menu.append(ID_TreeContent,
+    view_menu.append(ID::TreeContent,
                      "Use a Tree Control for the Content Pane")
-    view_menu.append(ID_NotebookContent,
+    view_menu.append(ID::NotebookContent,
                      "Use a wxAuiNotebook control for the Content Pane")
-    view_menu.append(ID_SizeReportContent,
+    view_menu.append(ID::SizeReportContent,
                      "Use a Size Reporter for the Content Pane")
 
     options_menu = Wx::Menu.new
     # Hints
-    options_menu.append_radio_item(ID_TransparentHint,
+    options_menu.append_radio_item(ID::TransparentHint,
                                    "Transparent Hint")
-    options_menu.append_radio_item(ID_VenetianBlindsHint,
+    options_menu.append_radio_item(ID::VenetianBlindsHint,
                                    "Venetian Blinds Hint")
-    options_menu.append_radio_item(ID_RectangleHint,
+    options_menu.append_radio_item(ID::RectangleHint,
                                    "Rectangle Hint")
-    options_menu.append_radio_item(ID_NoHint,
+    options_menu.append_radio_item(ID::NoHint,
                                    "No Hint")
 
     options_menu.append_separator
     # Hints Options
-    options_menu.append_check_item(ID_HintFade,
+    options_menu.append_check_item(ID::HintFade,
                                    "Hint Fade-in")
-    options_menu.append_check_item(ID_AllowFloating,
+    options_menu.append_check_item(ID::AllowFloating,
                                    "Allow Floating")
-    options_menu.append_check_item(ID_NoVenetianFade,
+    options_menu.append_check_item(ID::NoVenetianFade,
                                    "Disable Venetian Blinds Hint Fade-in")
-    options_menu.append_check_item(ID_TransparentDrag,
+    options_menu.append_check_item(ID::TransparentDrag,
                                    "Transparent Drag")
-    options_menu.append_check_item(ID_AllowActivePane,
+    options_menu.append_check_item(ID::AllowActivePane,
                                    "Allow Active Pane")
     options_menu.append_separator
-    options_menu.append_radio_item(ID_NoGradient,
+    options_menu.append_radio_item(ID::NoGradient,
                                    "No Caption Gradient")
-    options_menu.append_radio_item(ID_VerticalGradient,
+    options_menu.append_radio_item(ID::VerticalGradient,
                                    "Vertical Caption Gradient")
-    options_menu.append_radio_item(ID_HorizontalGradient,
+    options_menu.append_radio_item(ID::HorizontalGradient,
                                    "Horizontal Caption Gradient")
     options_menu.append_separator
-    options_menu.append(ID_Settings, "Settings Pane")
+    options_menu.append(ID::Settings, "Settings Pane")
 
     notebook_menu = Wx::Menu.new
-    notebook_menu.append_radio_item(ID_NotebookArtGloss,
+    notebook_menu.append_radio_item(ID::NotebookArtGloss,
                                     "Glossy Theme (Default)")
-    notebook_menu.append_radio_item(ID_NotebookArtSimple,
+    notebook_menu.append_radio_item(ID::NotebookArtSimple,
                                     "Simple Theme")
 
     notebook_menu.append_separator
 
-    notebook_menu.append_radio_item(ID_NotebookNoCloseButton,
+    notebook_menu.append_radio_item(ID::NotebookNoCloseButton,
                                     "No Close Button")
-    notebook_menu.append_radio_item(ID_NotebookCloseButton,
+    notebook_menu.append_radio_item(ID::NotebookCloseButton,
                                     "Close Button at Right")
-    notebook_menu.append_radio_item(ID_NotebookCloseButtonAll,
+    notebook_menu.append_radio_item(ID::NotebookCloseButtonAll,
                                     "Close Button on All Tabs")
-    notebook_menu.append_radio_item(ID_NotebookCloseButtonActive,
+    notebook_menu.append_radio_item(ID::NotebookCloseButtonActive,
                                     "Close Button on Active Tab")
 
     notebook_menu.append_separator
-    notebook_menu.append_check_item(ID_NotebookAllowTabMove,
+    notebook_menu.append_check_item(ID::NotebookAllowTabMove,
                                     "Allow Tab Move")
-    notebook_menu.append_check_item(ID_NotebookAllowTabExternalMove,
+    notebook_menu.append_check_item(ID::NotebookAllowTabExternalMove,
                                     "Allow External Tab Move")
-    notebook_menu.append_check_item(ID_NotebookAllowTabSplit,
+    notebook_menu.append_check_item(ID::NotebookAllowTabSplit,
                                     "Allow Notebook Split")
-    notebook_menu.append_check_item(ID_NotebookScrollButtons,
+    notebook_menu.append_check_item(ID::NotebookScrollButtons,
                                     "Scroll Buttons Visible")
-    notebook_menu.append_check_item(ID_NotebookWindowList,
+    notebook_menu.append_check_item(ID::NotebookWindowList,
                                     "Window List Button Visible")
-    notebook_menu.append_check_item(ID_NotebookTabFixedWidth,
+    notebook_menu.append_check_item(ID::NotebookTabFixedWidth,
                                     "Fixed-width Tabs")
 
     @perspectives_menu = Wx::Menu.new
-    @perspectives_menu.append(ID_CreatePerspective,
+    @perspectives_menu.append(ID::CreatePerspective,
                               "Create Perspective")
-    @perspectives_menu.append(ID_CopyPerspectiveCode,
+    @perspectives_menu.append(ID::CopyPerspectiveCode,
                               "Copy Perspective Data To Clipboard")
     @perspectives_menu.append_separator
-    @perspectives_menu.append(ID_FirstPerspective + 0, "Default Startup")
-    @perspectives_menu.append(ID_FirstPerspective + 1, "All Panes")
+    @perspectives_menu.append(ID::FirstPerspective + 0, "Default Startup")
+    @perspectives_menu.append(ID::FirstPerspective + 1, "All Panes")
 
     help_menu = Wx::Menu.new
     help_menu.append(Wx::ID_ABOUT, "About...")
@@ -494,201 +500,231 @@ class AuiFrame < Wx::Frame
   end
 
   def setup_events
-    evt_erase_background { |e| on_erase_background(e) }
-    evt_size { |e| on_size(e) }
-
-    evt_menu(ID_CreateTree) { |e| on_create_tree }
-    evt_menu(ID_CreateGrid) { |e| on_create_grid }
-    evt_menu(ID_CreateText) { |e| on_create_text }
-    evt_menu(ID_CreateHTML) { |e| on_create_html }
-    evt_menu(ID_CreateSizeReport) { |e| on_create_size_report }
-    evt_menu(ID_CreateNotebook) { |e| on_create_notebook }
-    evt_menu(ID_CreatePerspective) { |e| on_create_perspective }
-    evt_menu(ID_CopyPerspectiveCode) { |e| on_copy_perspective_code }
-    evt_menu(ID_AllowFloating) { |e| on_manager_flag(e) }
-    evt_menu(ID_TransparentHint) { |e| on_manager_flag(e) }
-    evt_menu(ID_VenetianBlindsHint) { |e| on_manager_flag(e) }
-    evt_menu(ID_RectangleHint) { |e| on_manager_flag(e) }
-    evt_menu(ID_NoHint) { |e| on_manager_flag(e) }
-    evt_menu(ID_HintFade) { |e| on_manager_flag(e) }
-    evt_menu(ID_NoVenetianFade) { |e| on_manager_flag(e) }
-    evt_menu(ID_TransparentDrag) { |e| on_manager_flag(e) }
-    evt_menu(ID_AllowActivePane) { |e| on_manager_flag(e) }
-    evt_menu(ID_NotebookTabFixedWidth) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookNoCloseButton) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookCloseButton) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookCloseButtonAll) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookCloseButtonActive) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookAllowTabMove) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookAllowTabExternalMove) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookAllowTabSplit) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookScrollButtons) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookWindowList) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookArtGloss) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NotebookArtSimple) { |e| on_notebook_flag(e) }
-    evt_menu(ID_NoGradient) { |e| on_gradient(e) }
-    evt_menu(ID_VerticalGradient) { |e| on_gradient(e) }
-    evt_menu(ID_HorizontalGradient) { |e| on_gradient(e) }
-    evt_menu(ID_Settings) { on_settings }
-    evt_menu(ID_GridContent) { |e| on_change_content_pane(e) }
-    evt_menu(ID_TreeContent) { |e| on_change_content_pane(e) }
-    evt_menu(ID_TextContent) { |e| on_change_content_pane(e) }
-    evt_menu(ID_SizeReportContent) { |e| on_change_content_pane(e) }
-    evt_menu(ID_HTMLContent) { |e| on_change_content_pane(e) }
-    evt_menu(ID_NotebookContent) { |e| on_change_content_pane(e) }
+    evt_erase_background :on_erase_background
+    evt_size :on_size
+
+    evt_menu(ID::CreateTree) { |e| on_create_tree }
+    evt_menu(ID::CreateGrid) { |e| on_create_grid }
+    evt_menu(ID::CreateText) { |e| on_create_text }
+    evt_menu(ID::CreateHTML) { |e| on_create_html }
+    evt_menu(ID::CreateSizeReport) { |e| on_create_size_report }
+    evt_menu(ID::CreateNotebook) { |e| on_create_notebook }
+    evt_menu(ID::CreatePerspective) { |e| on_create_perspective }
+    evt_menu(ID::CopyPerspectiveCode) { |e| on_copy_perspective_code }
+    evt_menu(ID::AllowFloating, :on_manager_flag)
+    evt_menu(ID::TransparentHint, :on_manager_flag)
+    evt_menu(ID::VenetianBlindsHint, :on_manager_flag)
+    evt_menu(ID::RectangleHint, :on_manager_flag)
+    evt_menu(ID::NoHint, :on_manager_flag)
+    evt_menu(ID::HintFade, :on_manager_flag)
+    evt_menu(ID::NoVenetianFade, :on_manager_flag)
+    evt_menu(ID::TransparentDrag, :on_manager_flag)
+    evt_menu(ID::AllowActivePane, :on_manager_flag)
+    evt_menu(ID::NotebookTabFixedWidth, :on_notebook_flag)
+    evt_menu(ID::NotebookNoCloseButton, :on_notebook_flag)
+    evt_menu(ID::NotebookCloseButton, :on_notebook_flag)
+    evt_menu(ID::NotebookCloseButtonAll, :on_notebook_flag)
+    evt_menu(ID::NotebookCloseButtonActive, :on_notebook_flag)
+    evt_menu(ID::NotebookAllowTabMove, :on_notebook_flag)
+    evt_menu(ID::NotebookAllowTabExternalMove, :on_notebook_flag)
+    evt_menu(ID::NotebookAllowTabSplit, :on_notebook_flag)
+    evt_menu(ID::NotebookScrollButtons, :on_notebook_flag)
+    evt_menu(ID::NotebookWindowList, :on_notebook_flag)
+    evt_menu(ID::NotebookArtGloss, :on_notebook_flag)
+    evt_menu(ID::NotebookArtSimple, :on_notebook_flag)
+    evt_menu(ID::NoGradient, :on_gradient)
+    evt_menu(ID::VerticalGradient, :on_gradient)
+    evt_menu(ID::HorizontalGradient, :on_gradient)
+    evt_menu(ID::Settings) { on_settings }
+    evt_menu(ID::GridContent, :on_change_content_pane)
+    evt_menu(ID::TreeContent, :on_change_content_pane)
+    evt_menu(ID::TextContent, :on_change_content_pane)
+    evt_menu(ID::SizeReportContent, :on_change_content_pane)
+    evt_menu(ID::HTMLContent, :on_change_content_pane)
+    evt_menu(ID::NotebookContent, :on_change_content_pane)
+    evt_auitoolbar_tool_dropdown(ID::DropDownToolbarItem, :on_drop_down_toolbar_item)
     evt_menu(Wx::ID_EXIT) { |e| on_exit }
     evt_menu(Wx::ID_ABOUT) { |e| on_about }
-    evt_update_ui(ID_NotebookTabFixedWidth) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookNoCloseButton) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookCloseButton) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookCloseButtonAll) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookCloseButtonActive) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookAllowTabMove) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookAllowTabExternalMove) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookAllowTabSplit) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookScrollButtons) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NotebookWindowList) { |e| on_update_ui(e) }
-    evt_update_ui(ID_AllowFloating) { |e| on_update_ui(e) }
-    evt_update_ui(ID_TransparentHint) { |e| on_update_ui(e) }
-    evt_update_ui(ID_VenetianBlindsHint) { |e| on_update_ui(e) }
-    evt_update_ui(ID_RectangleHint) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NoHint) { |e| on_update_ui(e) }
-    evt_update_ui(ID_HintFade) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NoVenetianFade) { |e| on_update_ui(e) }
-    evt_update_ui(ID_TransparentDrag) { |e| on_update_ui(e) }
-    evt_update_ui(ID_NoGradient) { |e| on_update_ui(e) }
-    evt_update_ui(ID_VerticalGradient) { |e| on_update_ui(e) }
-    evt_update_ui(ID_HorizontalGradient) { |e| on_update_ui(e) }
-    evt_menu_range(ID_FirstPerspective,
-                   ID_FirstPerspective +
-                     @perspectives.length) { |e| on_restore_perspective(e) }
-    evt_aui_pane_close { |e| on_pane_close(e) }
-    evt_auinotebook_page_close(Wx::ID_ANY) { |e| on_notebook_page_close(e) }
+    evt_update_ui(ID::NotebookTabFixedWidth, :on_update_ui)
+    evt_update_ui(ID::NotebookNoCloseButton, :on_update_ui)
+    evt_update_ui(ID::NotebookCloseButton, :on_update_ui)
+    evt_update_ui(ID::NotebookCloseButtonAll, :on_update_ui)
+    evt_update_ui(ID::NotebookCloseButtonActive, :on_update_ui)
+    evt_update_ui(ID::NotebookAllowTabMove, :on_update_ui)
+    evt_update_ui(ID::NotebookAllowTabExternalMove, :on_update_ui)
+    evt_update_ui(ID::NotebookAllowTabSplit, :on_update_ui)
+    evt_update_ui(ID::NotebookScrollButtons, :on_update_ui)
+    evt_update_ui(ID::NotebookWindowList, :on_update_ui)
+    evt_update_ui(ID::AllowFloating, :on_update_ui)
+    evt_update_ui(ID::TransparentHint, :on_update_ui)
+    evt_update_ui(ID::VenetianBlindsHint, :on_update_ui)
+    evt_update_ui(ID::RectangleHint, :on_update_ui)
+    evt_update_ui(ID::NoHint, :on_update_ui)
+    evt_update_ui(ID::HintFade, :on_update_ui)
+    evt_update_ui(ID::NoVenetianFade, :on_update_ui)
+    evt_update_ui(ID::TransparentDrag, :on_update_ui)
+    evt_update_ui(ID::NoGradient, :on_update_ui)
+    evt_update_ui(ID::VerticalGradient, :on_update_ui)
+    evt_update_ui(ID::HorizontalGradient, :on_update_ui)
+    evt_menu_range(ID::FirstPerspective,
+                   ID::FirstPerspective +
+                     @perspectives.length, :on_restore_perspective)
+    evt_aui_pane_close :on_pane_close
+    evt_auinotebook_page_close(Wx::ID_ANY, :on_notebook_page_close)
   end
 
   # create some toolbars
   def setup_toolbars
-    tb1 = Wx::ToolBar.new(self, Wx::ID_ANY,
-                          Wx::DEFAULT_POSITION,
-                          Wx::DEFAULT_SIZE,
-                          Wx::TB_FLAT | Wx::TB_NODIVIDER)
-    tb1.set_tool_bitmap_size(Wx::Size.new(48, 48))
-    tb1.add_tool(101, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_ERROR))
+    # prepare a few custom overflow elements for the toolbars' overflow buttons
+    append_items = []
+    item = Wx::AUI::AuiToolBarItem.new
+    item.set_kind(Wx::ItemKind::ITEM_SEPARATOR)
+    append_items << item
+    item = Wx::AUI::AuiToolBarItem.new
+    item.set_kind(Wx::ItemKind::ITEM_NORMAL)
+    item.set_id(ID::CustomizeToolbar)
+    item.set_label('Customize...')
+    append_items << item
+
+    tb1 = Wx::AUI::AuiToolBar.new(self, Wx::ID_ANY,
+                                  Wx::DEFAULT_POSITION,
+                                  Wx::DEFAULT_SIZE,
+                                  Wx::AUI::AUI_TB_DEFAULT_STYLE | Wx::AUI::AUI_TB_OVERFLOW)
+    # tb1.set_tool_bitmap_size(Wx::Size.new(48, 48))
+    tb1.add_tool(ID::SampleItem+1, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_ERROR))
     tb1.add_separator
-    tb1.add_tool(102, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_QUESTION))
-    tb1.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_INFORMATION))
-    tb1.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_WARNING));
-    tb1.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_MISSING_IMAGE));
+    tb1.add_tool(ID::SampleItem+2, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_QUESTION))
+    tb1.add_tool(ID::SampleItem+3, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_INFORMATION))
+    tb1.add_tool(ID::SampleItem+4, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_WARNING))
+    tb1.add_tool(ID::SampleItem+5, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_MISSING_IMAGE))
+    tb1.set_custom_overflow_items(nil, append_items)
     tb1.realize
 
-    tb2 = Wx::ToolBar.new(self, Wx::ID_ANY, Wx::DEFAULT_POSITION,
-                          Wx::DEFAULT_SIZE,
-                          Wx::TB_FLAT | Wx::TB_NODIVIDER)
-    tb2.set_tool_bitmap_size(Wx::Size.new(16, 16))
-
-    tb2_bmp1 = Wx::ArtProvider::get_bitmap(Wx::ART_QUESTION,
-                                           Wx::ART_OTHER,
-                                           Wx::Size.new(16, 16))
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
+    tb2 = Wx::AUI::AuiToolBar.new(self, Wx::ID_ANY, Wx::DEFAULT_POSITION,
+                                 Wx::DEFAULT_SIZE,
+                                 Wx::AUI::AUI_TB_DEFAULT_STYLE | Wx::AUI::AUI_TB_OVERFLOW | Wx::AUI::AUI_TB_HORIZONTAL)
+    # tb2.set_tool_bitmap_size(Wx::Size.new(16, 16))
+
+    tb2_bmp1 = Wx::ArtProvider::get_bitmap_bundle(Wx::ART_QUESTION,
+                                                  Wx::ART_OTHER,
+                                                  Wx::Size.new(24, 24))
+    tb2.add_tool(ID::SampleItem+6, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+7, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+8, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+9, "Test", tb2_bmp1)
     tb2.add_separator
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
+    tb2.add_tool(ID::SampleItem+10, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+11, "Test", tb2_bmp1)
     tb2.add_separator
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
-    tb2.add_tool(101, "Test", tb2_bmp1);
+    tb2.add_tool(ID::SampleItem+12, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+13, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+14, "Test", tb2_bmp1)
+    tb2.add_tool(ID::SampleItem+15, "Test", tb2_bmp1)
+    tb2.set_custom_overflow_items(nil, append_items)
+    tb2.enable_tool(ID::SampleItem+6, false)
     tb2.realize
 
-    tb3 = Wx::ToolBar.new(self, Wx::ID_ANY,
-                          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                          Wx::TB_FLAT | Wx::TB_NODIVIDER)
-    tb3.set_tool_bitmap_size(Wx::Size.new(16, 16))
-    tb3_bmp1 = Wx::ArtProvider::get_bitmap(Wx::ART_FOLDER,
-                                           Wx::ART_OTHER,
-                                           Wx::Size.new(16, 16))
-    tb3.add_tool(101, "Test", tb3_bmp1)
-    tb3.add_tool(101, "Test", tb3_bmp1)
-    tb3.add_tool(101, "Test", tb3_bmp1)
-    tb3.add_tool(101, "Test", tb3_bmp1)
+    tb3 = Wx::AUI::AuiToolBar.new(self, Wx::ID_ANY,
+                                  Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                  Wx::AUI::AUI_TB_DEFAULT_STYLE | Wx::AUI::AUI_TB_OVERFLOW)
+    # tb3.set_tool_bitmap_size(Wx::Size.new(16, 16))
+    tb3_bmp1 = Wx::ArtProvider::get_bitmap_bundle(Wx::ART_FOLDER,
+                                                  Wx::ART_OTHER,
+                                                  Wx::Size.new(16, 16))
+    tb3.add_tool(ID::SampleItem+16, "Check 1", tb3_bmp1, "Check 1", Wx::ItemKind::ITEM_CHECK)
+    tb3.add_tool(ID::SampleItem+17, "Check 2", tb3_bmp1, "Check 2", Wx::ItemKind::ITEM_CHECK)
+    tb3.add_tool(ID::SampleItem+18, "Check 3", tb3_bmp1, "Check 3", Wx::ItemKind::ITEM_CHECK)
+    tb3.add_tool(ID::SampleItem+19, "Check 4", tb3_bmp1, "Check 4", Wx::ItemKind::ITEM_CHECK)
+    tb3.add_separator
+    tb3.add_tool(ID::SampleItem+20, "Radio 1", tb3_bmp1, "Radio 1", Wx::ItemKind::ITEM_RADIO)
+    tb3.add_tool(ID::SampleItem+21, "Radio 2", tb3_bmp1, "Radio 2", Wx::ItemKind::ITEM_RADIO)
+    tb3.add_tool(ID::SampleItem+22, "Radio 3", tb3_bmp1, "Radio 3", Wx::ItemKind::ITEM_RADIO)
     tb3.add_separator
-    tb3.add_tool(101, "Test", tb3_bmp1)
-    tb3.add_tool(101, "Test", tb3_bmp1)
+    tb3.add_tool(ID::SampleItem+23, "Radio 1 (Group 2)", tb3_bmp1, "Radio 1 (Group 2)", Wx::ItemKind::ITEM_RADIO)
+    tb3.add_tool(ID::SampleItem+24, "Radio 2 (Group 2)", tb3_bmp1, "Radio 2 (Group 2)", Wx::ItemKind::ITEM_RADIO)
+    tb3.add_tool(ID::SampleItem+25, "Radio 3 (Group 2)", tb3_bmp1, "Radio 3 (Group 2)", Wx::ItemKind::ITEM_RADIO)
+    tb3.set_custom_overflow_items(nil, append_items)
     tb3.realize
 
-    tb4 = Wx::ToolBar.new(self, Wx::ID_ANY,
-                          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                          Wx::TB_FLAT | Wx::TB_NODIVIDER | Wx::TB_HORZ_TEXT)
-    tb4.set_tool_bitmap_size(Wx::Size.new(16, 16))
-    tb4_bmp1 = Wx::ArtProvider::get_bitmap(Wx::ART_NORMAL_FILE,
-                                           Wx::ART_OTHER,
-                                           Wx::Size.new(16, 16))
-    tb4.add_tool(101, "Item 1", tb4_bmp1)
-    tb4.add_tool(101, "Item 2", tb4_bmp1)
-    tb4.add_tool(101, "Item 3", tb4_bmp1)
-    tb4.add_tool(101, "Item 4", tb4_bmp1)
+    tb4 = Wx::AUI::AuiToolBar.new(self, Wx::ID_ANY,
+                                  Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                  Wx::AUI::AUI_TB_DEFAULT_STYLE | Wx::AUI::AUI_TB_OVERFLOW | Wx::AUI::AUI_TB_TEXT | Wx::AUI::AUI_TB_HORZ_TEXT)
+    # tb4.set_tool_bitmap_size(Wx::Size.new(16, 16))
+    tb4_bmp1 = Wx::ArtProvider::get_bitmap_bundle(Wx::ART_NORMAL_FILE,
+                                                  Wx::ART_OTHER,
+                                                  Wx::Size.new(16, 16))
+    tb4.add_tool(ID::DropDownToolbarItem, "Item 1", tb4_bmp1)
+    tb4.add_tool(ID::SampleItem+23, "Item 2", tb4_bmp1)
+    tb4.set_tool_sticky(ID::SampleItem+23, true)
+    tb4.add_tool(ID::SampleItem+24, "Item 3", tb4_bmp1)
+    tb4.enable_tool(ID::SampleItem+24, false)
+    tb4.add_tool(ID::SampleItem+25, "Item 4", tb4_bmp1)
     tb4.add_separator
-    tb4.add_tool(101, "Item 5", tb4_bmp1)
-    tb4.add_tool(101, "Item 6", tb4_bmp1)
-    tb4.add_tool(101, "Item 7", tb4_bmp1)
-    tb4.add_tool(101, "Item 8", tb4_bmp1)
+    tb4.add_tool(ID::SampleItem+26, "Item 5", tb4_bmp1)
+    tb4.add_tool(ID::SampleItem+27, "Item 6", tb4_bmp1)
+    tb4.add_tool(ID::SampleItem+28, "Item 7", tb4_bmp1)
+    tb4.add_tool(ID::SampleItem+29, "Item 8", tb4_bmp1)
+    tb4.set_tool_drop_down(ID::DropDownToolbarItem, true)
+    tb4.set_custom_overflow_items(nil, append_items)
+    choice = Wx::Choice.new(tb4, ID::SampleItem+35)
+    choice.append('One choice')
+    choice.append('Another choice')
+    tb4.add_control(choice)
     tb4.realize
 
     # create some toolbars
-    tb5 = Wx::ToolBar.new(self, Wx::ID_ANY,
-                          Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
-                          Wx::TB_FLAT | Wx::TB_NODIVIDER | Wx::TB_VERTICAL)
-    tb5.set_tool_bitmap_size(Wx::Size.new(48, 48))
-    tb5.add_tool(101, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_ERROR))
+    tb5 = Wx::AUI::AuiToolBar.new(self, Wx::ID_ANY,
+                                  Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE,
+                                  Wx::AUI::AUI_TB_DEFAULT_STYLE | Wx::AUI::AUI_TB_OVERFLOW | Wx::AUI::AUI_TB_VERTICAL)
+    # tb5.set_tool_bitmap_size(Wx::Size.new(48, 48))
+    tb5.add_tool(ID::SampleItem+30, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_ERROR))
     tb5.add_separator
-    tb5.add_tool(102, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_QUESTION))
-    tb5.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_INFORMATION))
-    tb5.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_WARNING))
-    tb5.add_tool(103, "Test",
-                 Wx::ArtProvider::get_bitmap(Wx::ART_MISSING_IMAGE))
+    tb5.add_tool(ID::SampleItem+31, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_QUESTION))
+    tb5.add_tool(ID::SampleItem+32, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_INFORMATION))
+    tb5.add_tool(ID::SampleItem+33, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_WARNING))
+    tb5.add_tool(ID::SampleItem+34, "Test",
+                 Wx::ArtProvider::get_bitmap_bundle(Wx::ART_MISSING_IMAGE))
+    tb5.set_custom_overflow_items(nil, append_items)
     tb5.realize
 
     # add the toolbars to the manager
     pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb1').set_caption("Big Toolbar").toolbar_pane
-    pi.top.set_left_dockable(false).set_right_dockable(false)
+    pi.set_name('tb1').set_caption("Big Toolbar").toolbar_pane.top
+    # pi.top.set_left_dockable(false).set_right_dockable(false)
     @mgr.add_pane(tb1, pi)
 
     pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb2').set_caption("Toolbar 2").toolbar_pane
-    pi.top.set_row(1)
-    pi.set_left_dockable(false).set_right_dockable(false)
+    pi.set_name('tb2').set_caption("Toolbar 2 (horizontal)").toolbar_pane.top.set_row(1)
+    # pi.set_left_dockable(false).set_right_dockable(false)
     @mgr.add_pane(tb2, pi)
 
     pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb3').set_caption("Toolbar 3").toolbar_pane
-    pi.top.set_row(1).set_position(1)
-    pi.set_left_dockable(false).set_right_dockable(false)
+    pi.set_name('tb3').set_caption("Toolbar 3").toolbar_pane.top.set_row(1).set_position(1)
+    # pi.set_left_dockable(false).set_right_dockable(false)
     @mgr.add_pane(tb3, pi)
 
     pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb4').set_caption("Sample Bookmark Toolbar")
-    pi.toolbar_pane.top.set_row(2)
-    pi.set_left_dockable(false).set_right_dockable(false)
+    pi.set_name('tb4').set_caption("Sample Bookmark Toolbar").toolbar_pane.top.set_row(2)
+    # pi.set_left_dockable(false).set_right_dockable(false)
     @mgr.add_pane(tb4, pi)
 
     pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb5').set_caption("Sample Vertical Toolbar")
-    pi.toolbar_pane.left.set_gripper_top
-    pi.set_left_dockable(false).set_right_dockable(false)
+    pi.set_name('tb5').set_caption("Sample Vertical Toolbar").toolbar_pane.left.set_gripper_top
+    # pi.set_left_dockable(false).set_right_dockable(false)
     @mgr.add_pane(tb5, pi)
+
+    @mgr.add_pane(Wx::Button.new(self, label: 'Test Button'),
+                  Wx::AUI::AuiPaneInfo.new.set_name('tb6').toolbar_pane.top.set_row(2).set_position(1)
+                                      .set_left_dockable(false).set_right_dockable(false))
   end
 
   def setup_panes
@@ -780,12 +816,6 @@ class AuiFrame < Wx::Frame
     pi = Wx::AuiPaneInfo.new
     pi.set_name('notebook_content').center_pane.hide
     @mgr.add_pane(create_notebook, pi)
-
-    pi = Wx::AuiPaneInfo.new
-    pi.set_name('tb6').toolbar_pane.top
-    pi.set_row(2).set_position(1)
-    pi.set_left_dockable(false).set_right_dockable(false)
-    @mgr.add_pane(Wx::Button.new(self, Wx::ID_ANY, "Test Button"), pi)
   end
 
   # make some default perspectives
@@ -834,11 +864,11 @@ class AuiFrame < Wx::Frame
   def on_gradient(event)
     gradient = nil
     case event.get_id
-    when ID_NoGradient
+    when ID::NoGradient
       gradient = Wx::AUI_GRADIENT_NONE
-    when ID_VerticalGradient
+    when ID::VerticalGradient
       gradient = Wx::AUI_GRADIENT_VERTICAL
-    when ID_HorizontalGradient
+    when ID::HorizontalGradient
       gradient = Wx::AUI_GRADIENT_HORIZONTAL
     end
     return if not gradient
@@ -849,10 +879,10 @@ class AuiFrame < Wx::Frame
 
   def on_manager_flag(event)
     e_id = event.get_id
-    if e_id == ID_TransparentHint or
-      e_id == ID_VenetianBlindsHint or
-      e_id == ID_RectangleHint or
-      e_id == ID_NoHint
+    if e_id == ID::TransparentHint or
+      e_id == ID::VenetianBlindsHint or
+      e_id == ID::RectangleHint or
+      e_id == ID::NoHint
       flags = @mgr.get_flags
       flags &= ~Wx::AUI_MGR_TRANSPARENT_HINT
       flags &= ~Wx::AUI_MGR_VENETIAN_BLINDS_HINT
@@ -862,21 +892,21 @@ class AuiFrame < Wx::Frame
 
     flag = nil
     case e_id
-    when ID_AllowFloating
+    when ID::AllowFloating
       flag = Wx::AUI_MGR_ALLOW_FLOATING
-    when ID_TransparentDrag
+    when ID::TransparentDrag
       flag = Wx::AUI_MGR_TRANSPARENT_DRAG
-    when ID_HintFade
+    when ID::HintFade
       flag = Wx::AUI_MGR_HINT_FADE
-    when ID_NoVenetianFade
+    when ID::NoVenetianFade
       flag = Wx::AUI_MGR_NO_VENETIAN_BLINDS_FADE
-    when ID_AllowActivePane
+    when ID::AllowActivePane
       flag = Wx::AUI_MGR_ALLOW_ACTIVE_PANE
-    when ID_TransparentHint
+    when ID::TransparentHint
       flag = Wx::AUI_MGR_TRANSPARENT_HINT
-    when ID_VenetianBlindsHint
+    when ID::VenetianBlindsHint
       flag = Wx::AUI_MGR_VENETIAN_BLINDS_HINT
-    when ID_RectangleHint
+    when ID::RectangleHint
       flag = Wx::AUI_MGR_RECTANGLE_HINT
     end
 
@@ -890,49 +920,49 @@ class AuiFrame < Wx::Frame
   def on_notebook_flag(event)
     e_id = event.get_id
 
-    if e_id == ID_NotebookNoCloseButton or
-      e_id == ID_NotebookCloseButton or
-      e_id == ID_NotebookCloseButtonAll or
-      e_id == ID_NotebookCloseButtonActive
+    if e_id == ID::NotebookNoCloseButton or
+      e_id == ID::NotebookCloseButton or
+      e_id == ID::NotebookCloseButtonAll or
+      e_id == ID::NotebookCloseButtonActive
       @notebook_style &= ~(Wx::AUI_NB_CLOSE_BUTTON |
         Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB |
         Wx::AUI_NB_CLOSE_ON_ALL_TABS)
     end
 
     case e_id
-    when ID_NotebookNoCloseButton
+    when ID::NotebookNoCloseButton
       # nothing
-    when ID_NotebookCloseButton
+    when ID::NotebookCloseButton
       @notebook_style |= Wx::AUI_NB_CLOSE_BUTTON
-    when ID_NotebookCloseButtonAll
+    when ID::NotebookCloseButtonAll
       @notebook_style |= Wx::AUI_NB_CLOSE_ON_ALL_TABS
-    when ID_NotebookCloseButtonActive
+    when ID::NotebookCloseButtonActive
       @notebook_style |= Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB
     end
 
-    if e_id == ID_NotebookAllowTabMove
+    if e_id == ID::NotebookAllowTabMove
       @notebook_style ^= Wx::AUI_NB_TAB_MOVE
     end
 
-    if e_id == ID_NotebookAllowTabExternalMove
+    if e_id == ID::NotebookAllowTabExternalMove
       @notebook_style ^= Wx::AUI_NB_TAB_EXTERNAL_MOVE
-    elsif e_id == ID_NotebookAllowTabSplit
+    elsif e_id == ID::NotebookAllowTabSplit
       @notebook_style ^= Wx::AUI_NB_TAB_SPLIT
-    elsif e_id == ID_NotebookWindowList
+    elsif e_id == ID::NotebookWindowList
       @notebook_style ^= Wx::AUI_NB_WINDOWLIST_BUTTON
-    elsif e_id == ID_NotebookScrollButtons
+    elsif e_id == ID::NotebookScrollButtons
       @notebook_style ^= Wx::AUI_NB_SCROLL_BUTTONS
-    elsif e_id == ID_NotebookTabFixedWidth
+    elsif e_id == ID::NotebookTabFixedWidth
       @notebook_style ^= Wx::AUI_NB_TAB_FIXED_WIDTH
     end
 
     @mgr.each_pane do |pane|
       maybe_nb = pane.window
       next unless maybe_nb.kind_of?(Wx::AuiNotebook)
-      if e_id == ID_NotebookArtGloss
+      if e_id == ID::NotebookArtGloss
         maybe_nb.use_default_art
         @notebook_theme = 0
-      elsif e_id == ID_NotebookArtSimple
+      elsif e_id == ID::NotebookArtSimple
         maybe_nb.use_simple_art
         @notebook_theme = 1
       end
@@ -946,56 +976,56 @@ class AuiFrame < Wx::Frame
     flags = @mgr.get_flags
 
     case event.get_id
-    when ID_NoGradient
+    when ID::NoGradient
       event.check(@mgr.get_art_provider.get_metric(Wx::AUI_DOCKART_GRADIENT_TYPE) == Wx::AUI_GRADIENT_NONE)
-    when ID_VerticalGradient
+    when ID::VerticalGradient
       event.check(@mgr.get_art_provider.get_metric(Wx::AUI_DOCKART_GRADIENT_TYPE) == Wx::AUI_GRADIENT_VERTICAL)
-    when ID_HorizontalGradient
+    when ID::HorizontalGradient
       event.check(@mgr.get_art_provider.get_metric(Wx::AUI_DOCKART_GRADIENT_TYPE) == Wx::AUI_GRADIENT_HORIZONTAL)
-    when ID_AllowFloating
+    when ID::AllowFloating
       event.check((flags & Wx::AUI_MGR_ALLOW_FLOATING) != 0)
-    when ID_TransparentDrag
+    when ID::TransparentDrag
       event.check((flags & Wx::AUI_MGR_TRANSPARENT_DRAG) != 0)
-    when ID_TransparentHint
+    when ID::TransparentHint
       event.check((flags & Wx::AUI_MGR_TRANSPARENT_HINT) != 0)
-    when ID_VenetianBlindsHint
+    when ID::VenetianBlindsHint
       event.check((flags & Wx::AUI_MGR_VENETIAN_BLINDS_HINT) != 0)
-    when ID_RectangleHint
+    when ID::RectangleHint
       event.check((flags & Wx::AUI_MGR_RECTANGLE_HINT) != 0)
-    when ID_NoHint
+    when ID::NoHint
       event.check((Wx::AUI_MGR_TRANSPARENT_HINT |
         Wx::AUI_MGR_VENETIAN_BLINDS_HINT |
         Wx::AUI_MGR_RECTANGLE_HINT) & flags == 0)
-    when ID_HintFade
+    when ID::HintFade
       event.check((flags & Wx::AUI_MGR_HINT_FADE) != 0)
-    when ID_NoVenetianFade
+    when ID::NoVenetianFade
       event.check((flags & Wx::AUI_MGR_NO_VENETIAN_BLINDS_FADE) != 0)
-    when ID_NotebookNoCloseButton
+    when ID::NotebookNoCloseButton
       event.check((@notebook_style &
         (Wx::AUI_NB_CLOSE_BUTTON |
           Wx::AUI_NB_CLOSE_ON_ALL_TABS |
           Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB)) != 0)
-    when ID_NotebookCloseButton
+    when ID::NotebookCloseButton
       event.check((@notebook_style & Wx::AUI_NB_CLOSE_BUTTON) != 0)
-    when ID_NotebookCloseButtonAll
+    when ID::NotebookCloseButtonAll
       event.check((@notebook_style & Wx::AUI_NB_CLOSE_ON_ALL_TABS) != 0)
-    when ID_NotebookCloseButtonActive
+    when ID::NotebookCloseButtonActive
       event.check((@notebook_style & Wx::AUI_NB_CLOSE_ON_ACTIVE_TAB) != 0)
-    when ID_NotebookAllowTabSplit
+    when ID::NotebookAllowTabSplit
       event.check((@notebook_style & Wx::AUI_NB_TAB_SPLIT) != 0)
-    when ID_NotebookAllowTabMove
+    when ID::NotebookAllowTabMove
       event.check((@notebook_style & Wx::AUI_NB_TAB_MOVE) != 0)
-    when ID_NotebookAllowTabExternalMove
+    when ID::NotebookAllowTabExternalMove
       event.check((@notebook_style & Wx::AUI_NB_TAB_EXTERNAL_MOVE) != 0)
-    when ID_NotebookScrollButtons
+    when ID::NotebookScrollButtons
       event.check((@notebook_style & Wx::AUI_NB_SCROLL_BUTTONS) != 0)
-    when ID_NotebookWindowList
+    when ID::NotebookWindowList
       event.check((@notebook_style & Wx::AUI_NB_WINDOWLIST_BUTTON) != 0)
-    when ID_NotebookTabFixedWidth
+    when ID::NotebookTabFixedWidth
       event.check((@notebook_style & Wx::AUI_NB_TAB_FIXED_WIDTH) != 0)
-    when ID_NotebookArtGloss
+    when ID::NotebookArtGloss
       event.check(@notebook_style == 0)
-    when ID_NotebookArtSimple
+    when ID::NotebookArtSimple
       event.check(@notebook_style == 1)
     end
   end
@@ -1019,7 +1049,7 @@ class AuiFrame < Wx::Frame
       if @perspectives.length.zero?
         @perspectives_menu.append_separator
       end
-      @perspectives_menu.append(ID_FirstPerspective + @perspectives.length,
+      @perspectives_menu.append(ID::FirstPerspective + @perspectives.length,
                                 dlg.get_value)
       @perspectives << @mgr.save_perspective
     end
@@ -1030,7 +1060,7 @@ class AuiFrame < Wx::Frame
   end
 
   def on_restore_perspective(event)
-    perspective = @perspectives[event.get_id - ID_FirstPerspective]
+    perspective = @perspectives[event.get_id - ID::FirstPerspective]
     @mgr.load_perspective(perspective)
   end
 
@@ -1108,15 +1138,54 @@ class AuiFrame < Wx::Frame
 
   def on_change_content_pane(event)
     e_id = event.get_id
-    @mgr.get_pane("grid_content").show(e_id == ID_GridContent)
-    @mgr.get_pane("text_content").show(e_id == ID_TextContent)
-    @mgr.get_pane("tree_content").show(e_id == ID_TreeContent)
-    @mgr.get_pane("sizereport_content").show(e_id == ID_SizeReportContent)
-    @mgr.get_pane("html_content").show(e_id == ID_HTMLContent)
-    @mgr.get_pane("notebook_content").show(e_id == ID_NotebookContent)
+    @mgr.get_pane("grID::content").show(e_id == ID::GridContent)
+    @mgr.get_pane("text_content").show(e_id == ID::TextContent)
+    @mgr.get_pane("tree_content").show(e_id == ID::TreeContent)
+    @mgr.get_pane("sizereport_content").show(e_id == ID::SizeReportContent)
+    @mgr.get_pane("html_content").show(e_id == ID::HTMLContent)
+    @mgr.get_pane("notebook_content").show(e_id == ID::NotebookContent)
     @mgr.update
   end
 
+  def on_drop_down_toolbar_item(evt)
+    if evt.is_drop_down_clicked
+      tb = evt.get_event_object
+
+      tb.set_tool_sticky(evt.id, true)
+
+      # create the popup menu
+      menuPopup = Wx::Menu.new
+
+      bmp = Wx::ArtProvider.get_bitmap_bundle(Wx::ART_QUESTION, Wx::ART_OTHER, from_dip(Wx::Size.new(16,16)))
+
+      m1 = Wx::MenuItem.new(menuPopup, 10001, 'Drop Down Item 1')
+      m1.set_bitmap(bmp)
+      menuPopup.append(m1)
+
+      m2 =  Wx::MenuItem.new(menuPopup, 10002, 'Drop Down Item 2')
+      m2.set_bitmap(bmp)
+      menuPopup.append(m2)
+
+      m3 = Wx::MenuItem.new(menuPopup, 10003, 'Drop Down Item 3')
+      m3.set_bitmap(bmp)
+      menuPopup.append(m3)
+
+      m4 = Wx::MenuItem.new(menuPopup, 10004, 'Drop Down Item 4')
+      m4.set_bitmap(bmp)
+      menuPopup.append(m4)
+
+      # line up our menu with the button
+      rect = tb.get_tool_rect(evt.id)
+      pt = tb.client_to_screen(rect.bottom_left)
+      pt = screen_to_client(pt)
+
+      popup_menu(menuPopup, pt)
+
+      # make sure the button is "un-stuck"
+      tb.set_tool_sticky(evt.id, false)
+    end
+  end
+
   def on_exit
     close(true)
   end