Fixed problem where corner label was displayed when either row or col label size...

[wxWidgets.git] / src / common / event.cpp

diff --git a/src/common/event.cpp b/src/common/event.cpp
index 0278a68a42e15f3c7313bbe997eefa5ea419e7b2..ba257dcc468fe40f229fcaf117b1e6f6ef15cd5e 100644 (file)
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -46,9 +46,9 @@
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 
     #include "wx/validate.h"
 #endif // wxUSE_GUI
 

-#if wxUSE_GUI
-    #if defined(__VISAGECPP__) && __IBMCPP__ >= 400
-    // define these here to keep from getting multiply defines externals
+
+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+// must define these static for VA or else you get multiply defined symbols everywhere

 const wxEventType wxEVT_NULL = 0;
 const wxEventType wxEVT_FIRST = 10000;
 
 const wxEventType wxEVT_NULL = 0;
 const wxEventType wxEVT_FIRST = 10000;
 


@@ -234,15 +234,8 @@ const wxEventType wxEVT_COMMAND_LIST_ITEM_ACTIVATED =       wxEVT_FIRST + 715;
  /* Tab and notebook control event types */
 const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED =           wxEVT_FIRST + 800;
 const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING =          wxEVT_FIRST + 801;
  /* Tab and notebook control event types */
 const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGED =           wxEVT_FIRST + 800;
 const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING =          wxEVT_FIRST + 801;

-
-#if defined(__BORLANDC__) && defined(__WIN16__)
-/* For 16-bit BC++, these 2 are identical (truncated) */
-const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGED =     wxEVT_FIRST + 802;
-const wxEventType wxEVT_COMMAND_NB_PAGE_CHANGING =    wxEVT_FIRST + 803;
-#else

 const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED =     wxEVT_FIRST + 802;
 const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING =    wxEVT_FIRST + 803;
 const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED =     wxEVT_FIRST + 802;
 const wxEventType wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING =    wxEVT_FIRST + 803;

-#endif

 
 /* Splitter events */
 const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850;
 
 /* Splitter events */
 const wxEventType wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = wxEVT_FIRST + 850;


@@ -264,9 +257,7 @@ const wxEventType wxEVT_CALENDAR_DOUBLECLICKED = wxEVT_FIRST + 954;
 const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955;
 
 const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;
 const wxEventType wxEVT_CALENDAR_WEEKDAY_CLICKED = wxEVT_FIRST + 955;
 
 const wxEventType wxEVT_USER_FIRST = wxEVT_FIRST + 2000;

-
-    #endif // VisualAge C++ V4.0
-#endif // wxUSE_GUI
+#endif

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros