Only update the size if the parent is a frame and the frame is

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

diff --git a/src/common/datacmn.cpp b/src/common/datacmn.cpp
index a1155538ed02772cedaec4c7388d8d2679042233..6c306155e4d439886467c904d3d854c5a41cb756 100644 (file)
--- a/src/common/datacmn.cpp
+++ b/src/common/datacmn.cpp
@@ -120,8 +120,9 @@ WXDLLEXPORT_DATA(const wxChar *) wxFrameNameStr = wxT("frame");
 WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
 WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
 WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");
 WXDLLEXPORT_DATA(const wxChar *) wxGaugeNameStr = wxT("gauge");
 WXDLLEXPORT_DATA(const wxChar *) wxStaticBoxNameStr = wxT("groupBox");
 WXDLLEXPORT_DATA(const wxChar *) wxListBoxNameStr = wxT("listBox");

-WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("message");
-WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("message");
+WXDLLEXPORT_DATA(const wxChar *) wxListCtrlNameStr = wxT("listCtrl");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticTextNameStr = wxT("staticText");
+WXDLLEXPORT_DATA(const wxChar *) wxStaticBitmapNameStr = wxT("staticBitmap");

 WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
 WXDLLEXPORT_DATA(const wxChar *) wxNotebookNameStr = wxT("notebook");
 WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");
 WXDLLEXPORT_DATA(const wxChar *) wxMultiTextNameStr = wxT("multitext");
 WXDLLEXPORT_DATA(const wxChar *) wxNotebookNameStr = wxT("notebook");
 WXDLLEXPORT_DATA(const wxChar *) wxPanelNameStr = wxT("panel");


@@ -138,6 +139,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxTreeCtrlNameStr = wxT("treeCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell");
 WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar");
 WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox");
 WXDLLEXPORT_DATA(const wxChar *) wxEnhDialogNameStr = wxT("Shell");
 WXDLLEXPORT_DATA(const wxChar *) wxToolBarNameStr = wxT("toolbar");
 WXDLLEXPORT_DATA(const wxChar *) wxVirtListBoxNameStr = wxT("virtListBox");

+WXDLLEXPORT_DATA(const wxChar *) wxDataViewCtrlNameStr = wxT("dataviewCtrl");

 
 // Default messages
 WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text");
 
 // Default messages
 WXDLLEXPORT_DATA(const wxChar *) wxGetTextFromUserPromptStr = wxT("Input Text");


@@ -147,7 +149,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorPromptStr = wxT("Select a file");
 
 // Other default strings
 WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
 
 // Other default strings
 WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =

-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)

     wxT("*.*")
 #else // Unix/Mac
     wxT("*")
     wxT("*.*")
 #else // Unix/Mac
     wxT("*")


@@ -156,7 +158,7 @@ WXDLLEXPORT_DATA(const wxChar *) wxFileSelectorDefaultWildcardStr =
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
 
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogNameStr = wxT("wxDirCtrl");
 WXDLLEXPORT_DATA(const wxChar *) wxDirDialogDefaultFolderStr = wxT("/");
 

-#if defined(__WXMSW__) || defined(__WXOS2__)
+#if defined(__WXMSW__) || defined(__OS2__)

 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif
 
 WXDLLEXPORT_DATA(const wxChar *) wxUserResourceStr = wxT("TEXT");
 #endif