Tooltip updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/os2/os2png.def b/src/os2/os2png.def
index e59207e295894a0f9c71fc020828c81ae21d6ac4..e892ecfd43657c3c5a0f69f834d87a26dd0e3b8c 100644 (file)
--- a/src/os2/os2png.def
+++ b/src/os2/os2png.def
@@ -4,56 +4,46 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 CODE LOADONCALL
 
 EXPORTS

-;From library:  H:\dev\wx2\wxWindows\LIB\os2png.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\os2png.lib

   ;From object file:  ..\png\png.c
     ;PUBDEFs (Symbols available from object file):
   ;From object file:  ..\png\png.c
     ;PUBDEFs (Symbols available from object file):

+      png_free_data

       png_reset_crc
       png_reset_crc

-      png_pHYs
-      png_sBIT
-      png_zTXt
+      png_info_init_3
+      png_mmx_support

       png_zfree
       png_zfree

-      png_sRGB
+      png_get_header_ver

       png_zalloc
       png_zalloc

-      png_oFFs

       png_init_io
       png_convert_to_rfc1123
       png_create_info_struct
       png_init_io
       png_convert_to_rfc1123
       png_create_info_struct

-      png_pass_ystart
-      png_pass_start

       png_info_init
       png_destroy_info_struct
       png_info_init
       png_destroy_info_struct

-      png_IDAT

       png_get_io_ptr
       png_libpng_ver
       png_get_io_ptr
       png_libpng_ver

-      png_IHDR
+      png_get_libpng_ver

       png_set_sig_bytes
       png_set_sig_bytes

-      png_tRNS
-      png_pass_mask
-      png_pass_dsp_mask

       png_check_sig
       png_sig_cmp
       png_check_sig
       png_sig_cmp

-      png_hIST

       png_get_copyright
       png_get_copyright

-      png_bKGD
-      png_IEND

       png_info_destroy
       png_info_destroy

-      png_tIME
-      png_gAMA
-      png_cHRM
+      png_reset_zstream

       png_get_header_version
       png_calculate_crc
       png_get_header_version
       png_calculate_crc

-      png_pass_yinc
-      png_pCAL
-      png_tEXt
-      png_PLTE
-      png_sig
-      png_pass_inc
+      png_init_mmx_flags
+      png_data_freer
+      png_handle_as_unknown
+      png_access_version_number

   ;From object file:  ..\png\pngread.c
     ;PUBDEFs (Symbols available from object file):
       png_create_read_struct
   ;From object file:  ..\png\pngread.c
     ;PUBDEFs (Symbols available from object file):
       png_create_read_struct

+      png_read_init_2

       png_set_read_status_fn
       png_set_read_status_fn

+      png_read_init_3

       png_read_row
       png_read_end
       png_read_row
       png_read_end

+      png_create_read_struct_2
+      png_read_png

       png_destroy_read_struct
       png_start_read_image
       png_read_destroy
       png_destroy_read_struct
       png_start_read_image
       png_read_destroy


@@ -64,6 +54,7 @@ EXPORTS
       png_read_rows
   ;From object file:  ..\png\pngrtran.c
     ;PUBDEFs (Symbols available from object file):
       png_read_rows
   ;From object file:  ..\png\pngrtran.c
     ;PUBDEFs (Symbols available from object file):

+      png_set_gray_1_2_4_to_8

       png_do_unshift
       png_build_gamma_table
       png_do_read_swap_alpha
       png_do_unshift
       png_build_gamma_table
       png_do_read_swap_alpha


@@ -73,9 +64,11 @@ EXPORTS
       png_do_read_transformations
       png_set_background
       png_set_expand
       png_do_read_transformations
       png_set_background
       png_set_expand

+      png_do_read_intrapixel

       png_build_grayscale_palette
       png_set_strip_16
       png_read_transform_info
       png_build_grayscale_palette
       png_set_strip_16
       png_read_transform_info

+      png_set_tRNS_to_alpha

       png_set_rgb_to_gray
       png_do_rgb_to_gray
       png_do_dither
       png_set_rgb_to_gray
       png_do_rgb_to_gray
       png_do_dither


@@ -86,7 +79,9 @@ EXPORTS
       png_set_gamma
       png_set_crc_action
       png_set_read_user_transform_fn
       png_set_gamma
       png_set_crc_action
       png_set_read_user_transform_fn

+      png_set_palette_to_rgb

       png_set_gray_to_rgb
       png_set_gray_to_rgb

+      png_set_rgb_to_gray_fixed

       png_do_background
       png_do_expand_palette
       png_do_gamma
       png_do_background
       png_do_expand_palette
       png_do_gamma


@@ -101,15 +96,19 @@ EXPORTS
       png_read_finish_row
       png_handle_sBIT
       png_handle_zTXt
       png_read_finish_row
       png_handle_sBIT
       png_handle_zTXt

+      png_handle_sCAL
+      png_handle_iCCP

       png_handle_bKGD
       png_handle_gAMA
       png_handle_cHRM
       png_crc_error
       png_read_filter_row
       png_handle_bKGD
       png_handle_gAMA
       png_handle_cHRM
       png_crc_error
       png_read_filter_row

+      png_handle_sPLT

       png_handle_pCAL
       png_handle_PLTE
       png_do_read_interlace
       png_check_chunk_name
       png_handle_pCAL
       png_handle_PLTE
       png_do_read_interlace
       png_check_chunk_name

+      png_decompress_chunk

       png_handle_pHYs
       png_crc_read
       png_handle_tIME
       png_handle_pHYs
       png_crc_read
       png_handle_tIME


@@ -154,6 +153,7 @@ EXPORTS
       png_set_shift
       png_do_invert
       png_set_invert_alpha
       png_set_shift
       png_do_invert
       png_set_invert_alpha

+      png_get_user_transform_ptr

       png_set_packswap
       png_set_bgr
       png_set_packing
       png_set_packswap
       png_set_bgr
       png_set_packing


@@ -162,6 +162,7 @@ EXPORTS
       png_do_swap
       png_do_packswap
       png_set_swap_alpha
       png_do_swap
       png_do_packswap
       png_set_swap_alpha

+      png_set_user_transform_info

       png_set_swap
       png_do_strip_filler
       png_do_bgr
       png_set_swap
       png_do_strip_filler
       png_do_bgr


@@ -170,12 +171,15 @@ EXPORTS
     ;PUBDEFs (Symbols available from object file):
       png_write_end
       png_set_compression_method
     ;PUBDEFs (Symbols available from object file):
       png_write_end
       png_set_compression_method

+      png_write_info_before_PLTE

       png_convert_from_struct_tm
       png_write_rows
       png_create_write_struct
       png_write_flush
       png_set_compression_mem_level
       png_write_destroy
       png_convert_from_struct_tm
       png_write_rows
       png_create_write_struct
       png_write_flush
       png_set_compression_mem_level
       png_write_destroy

+      png_write_init_2
+      png_write_init_3

       png_set_flush
       png_destroy_write_struct
       png_set_compression_strategy
       png_set_flush
       png_destroy_write_struct
       png_set_compression_strategy


@@ -184,14 +188,17 @@ EXPORTS
       png_set_filter_heuristics
       png_write_init
       png_write_image
       png_set_filter_heuristics
       png_write_init
       png_write_image

+      png_create_write_struct_2

       png_set_write_status_fn
       png_write_row
       png_set_write_status_fn
       png_write_row

+      png_write_png

       png_set_compression_window_bits
       png_convert_from_time_t
       png_set_compression_level
       png_set_filter
   ;From object file:  ..\png\pngwtran.c
     ;PUBDEFs (Symbols available from object file):
       png_set_compression_window_bits
       png_convert_from_time_t
       png_set_compression_level
       png_set_filter
   ;From object file:  ..\png\pngwtran.c
     ;PUBDEFs (Symbols available from object file):

+      png_do_write_intrapixel

       png_do_write_swap_alpha
       png_do_write_transformations
       png_do_pack
       png_do_write_swap_alpha
       png_do_write_transformations
       png_do_pack


@@ -204,6 +211,8 @@ EXPORTS
       png_write_IHDR
       png_save_uint_16
       png_write_start_row
       png_write_IHDR
       png_save_uint_16
       png_write_start_row

+      png_write_iCCP
+      png_write_sPLT

       png_write_sBIT
       png_write_pCAL
       png_write_cHRM
       png_write_sBIT
       png_write_pCAL
       png_write_cHRM


@@ -218,20 +227,24 @@ EXPORTS
       png_write_chunk
       png_write_oFFs
       png_write_chunk_start
       png_write_chunk
       png_write_oFFs
       png_write_chunk_start

+      png_write_gAMA_fixed

       png_write_IDAT
       png_write_chunk_data
       png_do_write_interlace
       png_write_sRGB
       png_write_finish_row
       png_write_filtered_row
       png_write_IDAT
       png_write_chunk_data
       png_do_write_interlace
       png_write_sRGB
       png_write_finish_row
       png_write_filtered_row

-      png_write_hIST
-      png_write_tEXt

       png_check_keyword
       png_check_keyword

+      png_write_tEXt
+      png_write_sCAL
+      png_write_hIST
+      png_write_cHRM_fixed

       png_write_PLTE
       png_write_gAMA
       png_write_find_filter
   ;From object file:  ..\png\pngerror.c
     ;PUBDEFs (Symbols available from object file):
       png_write_PLTE
       png_write_gAMA
       png_write_find_filter
   ;From object file:  ..\png\pngerror.c
     ;PUBDEFs (Symbols available from object file):

+      png_set_strip_error_numbers

       png_chunk_error
       png_set_error_fn
       png_get_error_ptr
       png_chunk_error
       png_set_error_fn
       png_get_error_ptr


@@ -240,51 +253,75 @@ EXPORTS
       png_error
   ;From object file:  ..\png\pngmem.c
     ;PUBDEFs (Symbols available from object file):
       png_error
   ;From object file:  ..\png\pngmem.c
     ;PUBDEFs (Symbols available from object file):

+      png_get_mem_ptr

       png_memcpy_check
       png_memcpy_check

+      png_malloc_default
+      png_free_default
+      png_create_struct_2

       png_memset_check
       png_memset_check

+      png_destroy_struct_2

       png_create_struct
       png_destroy_struct
       png_free
       png_create_struct
       png_destroy_struct
       png_free

+      png_malloc_warn
+      png_set_mem_fn

       png_malloc
   ;From object file:  ..\png\pngwio.c
     ;PUBDEFs (Symbols available from object file):
       png_malloc
   ;From object file:  ..\png\pngwio.c
     ;PUBDEFs (Symbols available from object file):

+      png_default_flush

       png_set_write_fn
       png_set_write_fn

+      png_default_write_data

       png_flush
       png_write_data
   ;From object file:  ..\png\pngrio.c
     ;PUBDEFs (Symbols available from object file):
       png_read_data
       png_flush
       png_write_data
   ;From object file:  ..\png\pngrio.c
     ;PUBDEFs (Symbols available from object file):
       png_read_data

+      png_default_read_data

       png_set_read_fn
   ;From object file:  ..\png\pngget.c
     ;PUBDEFs (Symbols available from object file):
       png_set_read_fn
   ;From object file:  ..\png\pngget.c
     ;PUBDEFs (Symbols available from object file):

+      png_get_gAMA_fixed

       png_get_text
       png_get_text

+      png_get_sCAL
+      png_get_rows

       png_get_x_offset_pixels
       png_get_tRNS
       png_get_x_offset_pixels
       png_get_tRNS

+      png_get_mmx_flagmask

       png_get_valid
       png_get_pCAL
       png_get_image_height
       png_get_valid
       png_get_pCAL
       png_get_image_height

+      png_get_iCCP

       png_get_compression_type
       png_get_PLTE
       png_get_rowbytes
       png_get_pixel_aspect_ratio
       png_get_pHYs
       png_get_compression_type
       png_get_PLTE
       png_get_rowbytes
       png_get_pixel_aspect_ratio
       png_get_pHYs

+      png_get_asm_flagmask

       png_get_bKGD
       png_get_sBIT
       png_get_bKGD
       png_get_sBIT

+      png_get_mmx_bitdepth_threshold

       png_get_hIST
       png_get_filter_type
       png_get_tIME
       png_get_hIST
       png_get_filter_type
       png_get_tIME

+      png_get_compression_buffer_size

       png_get_cHRM
       png_get_pixels_per_meter
       png_get_x_offset_microns
       png_get_y_offset_microns
       png_get_cHRM
       png_get_pixels_per_meter
       png_get_x_offset_microns
       png_get_y_offset_microns

+      png_get_unknown_chunks

       png_get_rgb_to_gray_status
       png_get_rgb_to_gray_status

+      png_get_asm_flags

       png_get_image_width
       png_get_interlace_type
       png_get_sRGB
       png_get_image_width
       png_get_interlace_type
       png_get_sRGB

+      png_get_user_chunk_ptr

       png_get_y_offset_pixels
       png_get_oFFs
       png_get_channels
       png_get_bit_depth
       png_get_y_offset_pixels
       png_get_oFFs
       png_get_channels
       png_get_bit_depth

+      png_get_sPLT
+      png_get_mmx_rowbytes_threshold
+      png_get_cHRM_fixed

       png_get_color_type
       png_get_signature
       png_get_gAMA
       png_get_color_type
       png_get_signature
       png_get_gAMA


@@ -294,17 +331,34 @@ EXPORTS
   ;From object file:  ..\png\pngset.c
     ;PUBDEFs (Symbols available from object file):
       png_set_text
   ;From object file:  ..\png\pngset.c
     ;PUBDEFs (Symbols available from object file):
       png_set_text

+      png_set_invalid

       png_set_cHRM
       png_set_gAMA
       png_set_sRGB
       png_set_sBIT
       png_set_cHRM
       png_set_gAMA
       png_set_sRGB
       png_set_sBIT

+      png_set_iCCP
+      png_permit_mng_features

       png_set_bKGD
       png_set_bKGD

+      png_set_sPLT
+      png_set_sCAL

       png_set_PLTE
       png_set_sRGB_gAMA_and_cHRM
       png_set_IHDR
       png_set_PLTE
       png_set_sRGB_gAMA_and_cHRM
       png_set_IHDR

+      png_set_read_user_chunk_fn

       png_set_oFFs
       png_set_oFFs

+      png_set_unknown_chunks

       png_set_tRNS
       png_set_pHYs
       png_set_tRNS
       png_set_pHYs

+      png_set_mmx_thresholds
+      png_set_asm_flags

       png_set_pCAL
       png_set_tIME
       png_set_pCAL
       png_set_tIME

+      png_set_compression_buffer_size
+      png_set_unknown_chunk_location
+      png_set_keep_unknown_chunks
+      png_set_cHRM_fixed

       png_set_hIST
       png_set_hIST

+      png_set_gAMA_fixed
+      png_permit_empty_plte
+      png_set_text_2
+      png_set_rows

diff --git a/src/os2/timer.cpp b/src/os2/timer.cpp
index d3c2fdff27053130fc9987a39035401d5afd2f9c..1bd868202c5bc3674f889075813b9beddf967f60 100644 (file)
--- a/src/os2/timer.cpp
+++ b/src/os2/timer.cpp
@@ -56,6 +56,22 @@ wxTimer::~wxTimer()
     wxTimerList.DeleteObject(this);
 }
 
     wxTimerList.DeleteObject(this);
 }
 

+void wxTimer::Notify()
+{
+    //
+    // The base class version generates an event if it has owner - which it
+    // should because otherwise nobody can process timer events, but it does
+    // not use the OS's ID, which OS/2 must have to figure out which timer fired
+    //
+    wxCHECK_RET( m_owner, _T("wxTimer::Notify() should be overridden.") );
+
+    wxTimerEvent                    vEvent( m_ulId
+                                           ,m_milli
+                                          );
+
+    (void)m_owner->ProcessEvent(vEvent);
+} // end of wxTimer::Notify
+

 bool wxTimer::Start(
   int                               nMilliseconds
 , bool                              bOneShot
 bool wxTimer::Start(
   int                               nMilliseconds
 , bool                              bOneShot

diff --git a/src/os2/toolbar.cpp b/src/os2/toolbar.cpp
index 16261a8feb5ed453cf7ca8e66b90f7ab20858320..bc1e7b972305d051396307e953e99d0254e5d0be 100644 (file)
--- a/src/os2/toolbar.cpp
+++ b/src/os2/toolbar.cpp
@@ -304,6 +304,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
     EVT_PAINT(wxToolBar::OnPaint)
     EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
     EVT_PAINT(wxToolBar::OnPaint)
     EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
     EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)

+    EVT_TIMER(-1, wxToolBar::OnTimer)

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -906,6 +907,8 @@ void wxToolBar::OnMouseEvent(
         ReleaseMouse();
     }
 
         ReleaseMouse();
     }
 

+    m_vToolTimer.Stop();
+    m_vToolTimer.Start(3000L, FALSE);

     if (!pTool)
     {
         if (m_nCurrentTool > -1)
     if (!pTool)
     {
         if (m_nCurrentTool > -1)


@@ -1406,4 +1409,18 @@ void wxToolBar::RaiseTool (
     }
 } // end of wxToolBar::RaiseTool
 
     }
 } // end of wxToolBar::RaiseTool
 

+void wxToolBar::OnTimer (
+  wxTimerEvent&                     rEvent
+)
+{
+    if (rEvent.GetId() == (int)m_ulToolTimer)
+    {
+        (void)wxMessageBox("wxWindows toolbar timer", "ToolTimer");
+    }
+    else if (rEvent.GetId() == (int)m_ulToolExpTimer)
+    {
+        (void)wxMessageBox("wxWindows toolbar timer", "ToolExpTimer");
+    }
+} // end of wxToolBar::OnTimer
+

 #endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
 #endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE

diff --git a/src/os2/wx23.def b/src/os2/wx23.def
index e52fc7ac46bad295db7dd55f5b6edf0795a1bc14..386e0800346ee6f7bb2f3c57b01fb4aec402d72f 100644 (file)
--- a/src/os2/wx23.def
+++ b/src/os2/wx23.def
@@ -4,7 +4,7 @@ DATA MULTIPLE NONSHARED READWRITE LOADONCALL
 CODE LOADONCALL
 
 EXPORTS
 CODE LOADONCALL
 
 EXPORTS

-;From library:  H:\DEV\WX2\WXWINDOWS\LIB\wx.lib
+;From library:  F:\DEV\WX2\WXWINDOWS\LIB\wx.lib

   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar
   ;From object file:  dummy.cpp
     ;PUBDEFs (Symbols available from object file):
       wxDummyChar


@@ -1946,7 +1946,7 @@ EXPORTS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS
       wxEVT_NC_LEFT_DCLICK
       wxEVT_INIT_DIALOG
       wxEVT_COMMAND_SET_FOCUS

-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\extended.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\extended.c

     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended
     ;PUBDEFs (Symbols available from object file):
       ConvertToIeeeExtended
       ConvertFromIeeeExtended


@@ -6150,7 +6150,7 @@ EXPORTS
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc
       Read32__17wxTextInputStreamFv
       ;wxTextInputStream::SkipIfEndOfLine(char)
       SkipIfEndOfLine__17wxTextInputStreamFc

-  ;From object file:  H:\DEV\WX2\WXWINDOWS\src\common\unzip.c
+  ;From object file:  F:\DEV\WX2\WXWINDOWS\src\common\unzip.c

     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo
     ;PUBDEFs (Symbols available from object file):
       unzReadCurrentFile
       unzGetCurrentFileInfo


@@ -9100,6 +9100,8 @@ EXPORTS
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray
       DeleteItem__16wxListMainWindowFl
       ;wxListLineDataArray::wxListLineDataArray(const wxListLineDataArray&)
       __ct__19wxListLineDataArrayFRC19wxListLineDataArray

+      ;wxListTextCtrl::wxListTextCtrl(wxListMainWindow*,unsigned int)
+      __ct__14wxListTextCtrlFP16wxListMainWindowUi

       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)
       ;wxListItemData::SetSize(int,int)
       SetSize__14wxListItemDataFiT1
       ;wxListLineData::SetItem(int,const wxListItem&)


@@ -9114,16 +9116,12 @@ EXPORTS
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi
       GetLineRect__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineLabelRect(unsigned int) const
       GetLineLabelRect__16wxListMainWindowCFUi

-      ;wxListMainWindow::GetItem(wxListItem&)
-      GetItem__16wxListMainWindowFR10wxListItem

       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
       ;wxListCtrl::FindItem(long,long)
       FindItem__10wxListCtrlFlT1
       ;wxListItemData::Init()
       Init__14wxListItemDataFv
       ;wxListItemData::GetItem(wxListItem&) const
       GetItem__14wxListItemDataCFR10wxListItem
       ;wxListCtrl::FindItem(long,long)
       FindItem__10wxListCtrlFlT1
       ;wxListItemData::Init()
       Init__14wxListItemDataFv

-      ;wxConstructorForwxListTextCtrl()
-      wxConstructorForwxListTextCtrl__Fv

       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()
       ;wxListHeaderWindow::~wxListHeaderWindow()
       __dt__18wxListHeaderWindowFv
       ;wxListMainWindow::wxListMainWindow()


@@ -9136,8 +9134,6 @@ EXPORTS
       SetCursor__10wxListCtrlFRC8wxCursor
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv
       SetCursor__10wxListCtrlFRC8wxCursor
       ;wxListLineData::ReverseHighlight()
       ReverseHighlight__14wxListLineDataFv

-      ;wxListMainWindow::OnRenameAccept()
-      OnRenameAccept__16wxListMainWindowFv

       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListHeaderWindow::Init()
       ;wxListRenameTimer::Notify()
       Notify__17wxListRenameTimerFv
       ;wxListHeaderWindow::Init()


@@ -9146,6 +9142,8 @@ EXPORTS
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
       GetTopItem__10wxListCtrlCFv
       GetWidth__16wxListHeaderDataCFv
       ;wxListCtrl::GetTopItem() const
       GetTopItem__10wxListCtrlCFv

+      ;wxListMainWindow::GetNextItem(long,int,int) const
+      GetNextItem__16wxListMainWindowCFliT2

       ;wxListCtrl::GetItemCount() const
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const
       ;wxListCtrl::GetItemCount() const
       GetItemCount__10wxListCtrlCFv
       ;wxListMainWindow::GetImageSize(int,int&,int&) const


@@ -9154,10 +9152,12 @@ EXPORTS
       Freeze__10wxListCtrlFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32
       Freeze__10wxListCtrlFv
       ;wxListHeaderWindow::DoDrawRect(wxDC*,int,int,int,int)
       DoDrawRect__18wxListHeaderWindowFP4wxDCiN32

-      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxListMainWindow::OnRenameAccept(unsigned int,const wxString&)
+      OnRenameAccept__16wxListMainWindowFUiRC8wxString

       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK
       wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK

-      ;wxListMainWindow::GetItemRect(long,wxRect&)
-      GetItemRect__16wxListMainWindowFlR6wxRect
+      wxEVT_COMMAND_LIST_COL_BEGIN_DRAG
+      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
+      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent

       wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED
       wxEVT_COMMAND_LIST_ITEM_FOCUSED
       wxEVT_COMMAND_LIST_ITEM_DESELECTED
       wxEVT_COMMAND_LIST_ITEM_ACTIVATED


@@ -9173,8 +9173,6 @@ EXPORTS
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent
       RecalculatePositions__16wxListMainWindowFUl
       ;wxListMainWindow::OnKeyDown(wxKeyEvent&)
       OnKeyDown__16wxListMainWindowFR10wxKeyEvent

-      ;wxListMainWindow::OnArrowChar(unsigned int,const wxKeyEvent&)
-      OnArrowChar__16wxListMainWindowFUiRC10wxKeyEvent

       ;wxListLineDataArray::operator=(const wxListLineDataArray&)
       __as__19wxListLineDataArrayFRC19wxListLineDataArray
       wxEVT_COMMAND_LIST_INSERT_ITEM
       ;wxListLineDataArray::operator=(const wxListLineDataArray&)
       __as__19wxListLineDataArrayFRC19wxListLineDataArray
       wxEVT_COMMAND_LIST_INSERT_ITEM


@@ -9283,6 +9281,8 @@ EXPORTS
       Index__19wxListLineDataArrayCFRC14wxListLineDataUl
       ;wxListCtrl::GetItemTextColour(long) const
       GetItemTextColour__10wxListCtrlCFl
       Index__19wxListLineDataArrayCFRC14wxListLineDataUl
       ;wxListCtrl::GetItemTextColour(long) const
       GetItemTextColour__10wxListCtrlCFl

+      ;wxListMainWindow::GetItemRect(long,wxRect&) const
+      GetItemRect__16wxListMainWindowCFlR6wxRect

       ;wxListCtrl::GetItemBackgroundColour(long) const
       GetItemBackgroundColour__10wxListCtrlCFl
       ;wxListCtrl::FindItem(long,const wxString&,unsigned long)
       ;wxListCtrl::GetItemBackgroundColour(long) const
       GetItemBackgroundColour__10wxListCtrlCFl
       ;wxListCtrl::FindItem(long,const wxString&,unsigned long)


@@ -9347,8 +9347,6 @@ EXPORTS
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv
       InitScrolling__16wxListMainWindowFv
       ;wxListItemData::GetY() const
       GetY__14wxListItemDataCFv

-      ;wxListMainWindow::GetSelectedItemCount()
-      GetSelectedItemCount__16wxListMainWindowFv

       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
       ;wxListMainWindow::GetItemCount() const
       ;wxListMainWindow::GetLineHeight() const
       GetLineHeight__16wxListMainWindowCFv
       ;wxListMainWindow::GetItemCount() const


@@ -9407,8 +9405,6 @@ EXPORTS
       HighlightLines__16wxListMainWindowFUiT1Ul
       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl
       HighlightLines__16wxListMainWindowFUiT1Ul
       ;wxListMainWindow::GetItemSpacing(unsigned long)
       GetItemSpacing__16wxListMainWindowFUl

-      ;wxListMainWindow::GetItemPosition(long,wxPoint&)
-      GetItemPosition__16wxListMainWindowFlR7wxPoint

       ;wxListCtrl::GetItemPosition(long,wxPoint&) const
       GetItemPosition__10wxListCtrlCFlR7wxPoint
       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)
       ;wxListCtrl::GetItemPosition(long,wxPoint&) const
       GetItemPosition__10wxListCtrlCFlR7wxPoint
       ;wxListMainWindow::FindItem(long,const wxString&,unsigned long)


@@ -9432,6 +9428,8 @@ EXPORTS
       GetLineY__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineHighlightRect(unsigned int) const
       GetLineHighlightRect__16wxListMainWindowCFUi
       GetLineY__16wxListMainWindowCFUi
       ;wxListMainWindow::GetLineHighlightRect(unsigned int) const
       GetLineHighlightRect__16wxListMainWindowCFUi

+      ;wxListMainWindow::GetItem(wxListItem&) const
+      GetItem__16wxListMainWindowCFR10wxListItem

       ;wxListHeaderData::GetItem(wxListItem&)
       GetItem__16wxListHeaderDataFR10wxListItem
       ;wxListLineData::GetItem(int,wxListItem&)
       ;wxListHeaderData::GetItem(wxListItem&)
       GetItem__16wxListHeaderDataFR10wxListItem
       ;wxListLineData::GetItem(int,wxListItem&)


@@ -9465,6 +9463,8 @@ EXPORTS
       Init__16wxListMainWindowFv
       ;wxListHeaderData::Init()
       Init__16wxListHeaderDataFv
       Init__16wxListMainWindowFv
       ;wxListHeaderData::Init()
       Init__16wxListHeaderDataFv

+      ;wxListMainWindow::GetSelectedItemCount() const
+      GetSelectedItemCount__16wxListMainWindowCFv

       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::GetEventTable() const
       ;wxListCtrl::GetSelectedItemCount() const
       GetSelectedItemCount__10wxListCtrlCFv
       ;wxListHeaderWindow::GetEventTable() const


@@ -9475,6 +9475,8 @@ EXPORTS
       GetDropTarget__10wxListCtrlCFv
       ;wxListCtrl::GetColumnCount() const
       GetColumnCount__10wxListCtrlCFv
       GetDropTarget__10wxListCtrlCFv
       ;wxListCtrl::GetColumnCount() const
       GetColumnCount__10wxListCtrlCFv

+      ;wxListTextCtrl::Finish()
+      Finish__14wxListTextCtrlFv

       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
       ;wxwxListHeaderDataListNode::DeleteData()
       ;wxListMainWindow::DeleteEverything()
       DeleteEverything__16wxListMainWindowFv
       ;wxwxListHeaderDataListNode::DeleteData()


@@ -9483,6 +9485,8 @@ EXPORTS
       DeleteAllItems__16wxListMainWindowFv
       ;wxListCtrl::DeleteAllColumns()
       DeleteAllColumns__10wxListCtrlFv
       DeleteAllItems__16wxListMainWindowFv
       ;wxListCtrl::DeleteAllColumns()
       DeleteAllColumns__10wxListCtrlFv

+      ;wxListTextCtrl::AcceptChanges()
+      AcceptChanges__14wxListTextCtrlFv

       ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       wxEVT_COMMAND_LIST_GET_INFO
       ;wxListCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__10wxListCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       wxEVT_COMMAND_LIST_GET_INFO


@@ -9496,8 +9500,6 @@ EXPORTS
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxListTextCtrl
       wxEVT_COMMAND_LIST_END_LABEL_EDIT
       ;wxListTextCtrl::sm_eventTableEntries
       sm_eventTableEntries__14wxListTextCtrl

-      ;wxListTextCtrl::sm_classwxListTextCtrl
-      sm_classwxListTextCtrl__14wxListTextCtrl

       __vft10wxListCtrl8wxObject
       ;wxListCtrl::SetWindowStyleFlag(long)
       SetWindowStyleFlag__10wxListCtrlFl
       __vft10wxListCtrl8wxObject
       ;wxListCtrl::SetWindowStyleFlag(long)
       SetWindowStyleFlag__10wxListCtrlFl


@@ -9519,6 +9521,8 @@ EXPORTS
       GetItemText__10wxListCtrlCFl
       ;wxListCtrl::GetItemSpacing(unsigned long) const
       GetItemSpacing__10wxListCtrlCFUl
       GetItemText__10wxListCtrlCFl
       ;wxListCtrl::GetItemSpacing(unsigned long) const
       GetItemSpacing__10wxListCtrlCFUl

+      ;wxListMainWindow::GetItemPosition(long,wxPoint&) const
+      GetItemPosition__16wxListMainWindowCFlR7wxPoint

       ;wxListCtrl::GetItemData(long) const
       GetItemData__10wxListCtrlCFl
       ;wxListMainWindow::EnsureVisible(long)
       ;wxListCtrl::GetItemData(long) const
       GetItemData__10wxListCtrlCFl
       ;wxListMainWindow::EnsureVisible(long)


@@ -9557,8 +9561,8 @@ EXPORTS
       InsertColumn__10wxListCtrlFlR10wxListItem
       ;wxListMainWindow::GetLineIconRect(unsigned int) const
       GetLineIconRect__16wxListMainWindowCFUi
       InsertColumn__10wxListCtrlFlR10wxListItem
       ;wxListMainWindow::GetLineIconRect(unsigned int) const
       GetLineIconRect__16wxListMainWindowCFUi

-      ;wxListMainWindow::GetItemState(long,long)
-      GetItemState__16wxListMainWindowFlT1
+      ;wxListMainWindow::GetItemState(long,long) const
+      GetItemState__16wxListMainWindowCFlT1

       ;wxListCtrl::GetItemRect(long,wxRect&,int) const
       GetItemRect__10wxListCtrlCFlR6wxRecti
       ;wxListMainWindow::GetColumnWidth(int) const
       ;wxListCtrl::GetItemRect(long,wxRect&,int) const
       GetItemRect__10wxListCtrlCFlR6wxRecti
       ;wxListMainWindow::GetColumnWidth(int) const


@@ -9577,8 +9581,6 @@ EXPORTS
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv
       wxConstructorForwxListView__Fv
       ;wxConstructorForwxListHeaderWindow()
       wxConstructorForwxListHeaderWindow__Fv

-      ;wxListTextCtrl::wxListTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxListMainWindow*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxListTextCtrlFP8wxWindowCiPUlP8wxStringP16wxListMainWindowRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6

       ;wxListCtrl::SetTextColour(const wxColour&)
       SetTextColour__10wxListCtrlFRC8wxColour
       ;wxListCtrl::SetBackgroundColour(const wxColour&)
       ;wxListCtrl::SetTextColour(const wxColour&)
       SetTextColour__10wxListCtrlFRC8wxColour
       ;wxListCtrl::SetBackgroundColour(const wxColour&)


@@ -9591,8 +9593,6 @@ EXPORTS
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv
       HasImage__16wxListHeaderDataCFv
       ;wxListItemData::GetWidth() const
       GetWidth__14wxListItemDataCFv

-      ;wxListMainWindow::GetNextItem(long,int,int)
-      GetNextItem__16wxListMainWindowFliT2

       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
       ;wxListCtrl::GetForegroundColour() const
       ;wxListHeaderData::GetImage() const
       GetImage__16wxListHeaderDataCFv
       ;wxListCtrl::GetForegroundColour() const


@@ -10499,6 +10499,8 @@ EXPORTS
       AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi
       AssignButtonsImageList__17wxGenericTreeCtrlFP11wxImageList
       ;wxGenericTreeCtrl::HitTest(const wxPoint&,int&)
       HitTest__17wxGenericTreeCtrlFRC7wxPointRi

+      ;wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl*,wxGenericTreeItem*)
+      __ct__14wxTreeTextCtrlFP17wxGenericTreeCtrlP17wxGenericTreeItem

       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeItem::~wxGenericTreeItem()
       ;wxGenericTreeCtrl::GetItemImage(const wxTreeItemId&,wxTreeItemIcon) const
       GetItemImage__17wxGenericTreeCtrlCFRC12wxTreeItemId14wxTreeItemIcon
       ;wxGenericTreeItem::~wxGenericTreeItem()


@@ -10507,8 +10509,6 @@ EXPORTS
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour
       Unselect__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::SetBackgroundColour(const wxColour&)
       SetBackgroundColour__17wxGenericTreeCtrlFRC8wxColour

-      ;wxGenericTreeCtrl::OnRenameAccept()
-      OnRenameAccept__17wxGenericTreeCtrlFv

       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const
       ;wxGenericTreeCtrl::GetEventTable() const
       GetEventTable__17wxGenericTreeCtrlCFv
       ;wxGenericTreeItem::GetCurrentImage() const


@@ -10517,6 +10517,8 @@ EXPORTS
       DeleteAllItems__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::CalculatePositions()
       CalculatePositions__17wxGenericTreeCtrlFv
       DeleteAllItems__17wxGenericTreeCtrlFv
       ;wxGenericTreeCtrl::CalculatePositions()
       CalculatePositions__17wxGenericTreeCtrlFv

+      ;wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem*,const wxString&)
+      OnRenameAccept__17wxGenericTreeCtrlFP17wxGenericTreeItemRC8wxString

       ;wxGenericTreeCtrl::SetItemText(const wxTreeItemId&,const wxString&)
       SetItemText__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId&) const
       ;wxGenericTreeCtrl::SetItemText(const wxTreeItemId&,const wxString&)
       SetItemText__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxString
       ;wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId&) const


@@ -10570,14 +10572,14 @@ EXPORTS
       AddRoot__17wxGenericTreeCtrlFRC8wxStringiT2P14wxTreeItemData
       ;wxGenericTreeCtrl::Init()
       Init__17wxGenericTreeCtrlFv
       AddRoot__17wxGenericTreeCtrlFRC8wxStringiT2P14wxTreeItemData
       ;wxGenericTreeCtrl::Init()
       Init__17wxGenericTreeCtrlFv

-      ;wxTreeTextCtrl::wxTreeTextCtrl(wxWindow*,const int,unsigned long*,wxString*,wxGenericTreeCtrl*,const wxString&,const wxPoint&,const wxSize&,int,const wxValidator&,const wxString&)
-      __ct__14wxTreeTextCtrlFP8wxWindowCiPUlP8wxStringP17wxGenericTreeCtrlRC8wxStringRC7wxPointRC6wxSizeiRC11wxValidatorT6

       ;wxGenericTreeCtrl::SetItemImage(const wxTreeItemId&,int,wxTreeItemIcon)
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
       ;wxGenericTreeCtrl::GetButtonsImageList() const
       GetButtonsImageList__17wxGenericTreeCtrlCFv
       ;wxGenericTreeCtrl::SetItemImage(const wxTreeItemId&,int,wxTreeItemIcon)
       SetItemImage__17wxGenericTreeCtrlFRC12wxTreeItemIdi14wxTreeItemIcon
       ;wxGenericTreeCtrl::SelectItem(const wxTreeItemId&,unsigned long,unsigned long)
       SelectItem__17wxGenericTreeCtrlFRC12wxTreeItemIdUlT2
       ;wxGenericTreeCtrl::GetButtonsImageList() const
       GetButtonsImageList__17wxGenericTreeCtrlCFv

+      ;wxTreeTextCtrl::AcceptChanges()
+      AcceptChanges__14wxTreeTextCtrlFv

       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)
       ;wxGenericTreeCtrl::Create(wxWindow*,int,const wxPoint&,const wxSize&,long,const wxValidator&,const wxString&)
       Create__17wxGenericTreeCtrlFP8wxWindowiRC7wxPointRC6wxSizelRC11wxValidatorRC8wxString
       ;wxGenericTreeCtrl::PaintItem(wxGenericTreeItem*,wxDC&)


@@ -10620,6 +10622,8 @@ EXPORTS
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv
       SetItemBackgroundColour__17wxGenericTreeCtrlFRC12wxTreeItemIdRC8wxColour
       ;wxTreeTextCtrl::GetEventTable() const
       GetEventTable__14wxTreeTextCtrlCFv

+      ;wxTreeTextCtrl::Finish()
+      Finish__14wxTreeTextCtrlFv

       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp
       ;wxGenericTreeCtrl::FillArray(wxGenericTreeItem*,wxArrayTreeItemIds&) const
       FillArray__17wxGenericTreeCtrlCFP17wxGenericTreeItemR18wxArrayTreeItemIds
   ;From object file:  ..\generic\treelay.cpp


@@ -14653,6 +14657,8 @@ EXPORTS
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv
       wxTimerList
       ;wxTimer::Init()
       Init__7wxTimerFv

+      ;wxTimer::Notify()
+      Notify__7wxTimerFv

       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()
       ;wxTimer::Start(int,unsigned long)
       Start__7wxTimerFiUl
       ;wxTimer::~wxTimer()


@@ -14706,6 +14712,8 @@ EXPORTS
       DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
       ;wxToolBar::OnSize(wxSizeEvent&)
       OnSize__9wxToolBarFR11wxSizeEvent
       DrawTool__9wxToolBarFR4wxDCP17wxToolBarToolBase
       ;wxToolBar::OnSize(wxSizeEvent&)
       OnSize__9wxToolBarFR11wxSizeEvent

+      ;wxToolBar::OnTimer(wxTimerEvent&)
+      OnTimer__9wxToolBarFR12wxTimerEvent

       ;wxToolBar::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__9wxToolBarFR12wxMouseEvent
       ;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long)
       ;wxToolBar::OnMouseEvent(wxMouseEvent&)
       OnMouseEvent__9wxToolBarFR12wxMouseEvent
       ;wxToolBar::DoSetToggle(wxToolBarToolBase*,unsigned long)