applied patch for compilation with gcc 3.0

[wxWidgets.git] / src / mac / data.cpp

diff --git a/src/mac/data.cpp b/src/mac/data.cpp
index fab57c49fef17f87d70ee7667be89d140b02688a..a504169614af8703f3250e1e809ac066580f56d1 100644 (file)
--- a/src/mac/data.cpp
+++ b/src/mac/data.cpp
@@ -92,6 +92,7 @@ wxFont   wxNullFont;
 wxColour wxNullColour;
 
 // Default window names
 wxColour wxNullColour;
 
 // Default window names

+const wxChar *wxControlNameStr = wxT("control");

 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");
 const wxChar *wxButtonNameStr = wxT("button");
 const wxChar *wxCanvasNameStr = wxT("canvas");
 const wxChar *wxCheckBoxNameStr = wxT("check");


@@ -102,8 +103,8 @@ const wxChar *wxFrameNameStr = wxT("frame");
 const wxChar *wxGaugeNameStr = wxT("gauge");
 const wxChar *wxStaticBoxNameStr = wxT("groupBox");
 const wxChar *wxListBoxNameStr = wxT("listBox");
 const wxChar *wxGaugeNameStr = wxT("gauge");
 const wxChar *wxStaticBoxNameStr = wxT("groupBox");
 const wxChar *wxListBoxNameStr = wxT("listBox");

-const wxChar *wxStaticTextNameStr = wxT("message");
-const wxChar *wxStaticBitmapNameStr = wxT("message");
+const wxChar *wxStaticTextNameStr = wxT("statictext");
+const wxChar *wxStaticBitmapNameStr = wxT("staticbitmap");

 const wxChar *wxMultiTextNameStr = wxT("multitext");
 const wxChar *wxPanelNameStr = wxT("panel");
 const wxChar *wxRadioBoxNameStr = wxT("radioBox");
 const wxChar *wxMultiTextNameStr = wxT("multitext");
 const wxChar *wxPanelNameStr = wxT("panel");
 const wxChar *wxRadioBoxNameStr = wxT("radioBox");


@@ -134,5 +135,17 @@ const wxChar *wxDirDialogDefaultFolderStr = wxT("/");
 const wxChar *wxFloatToStringStr = wxT("%.2f");
 const wxChar *wxDoubleToStringStr = wxT("%.2f");
 
 const wxChar *wxFloatToStringStr = wxT("%.2f");
 const wxChar *wxDoubleToStringStr = wxT("%.2f");
 

+#if wxUSE_SHARED_LIBRARY
+///// Event tables (also must be in one, statically-linked file for shared libraries)
+
+// This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
+const wxEventTable *wxEvtHandler::GetEventTable() const { return &wxEvtHandler::sm_eventTable; }
+
+const wxEventTable wxEvtHandler::sm_eventTable =
+       { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
+
+const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
+#endif
+

 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);