X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b1de9c2eeedf27401d897a609baf15d8ff5914e..5a224901b8ede55e1db9980f0fcaf7d2cb49285f:/src/common/resourc2.cpp?ds=sidebyside

diff --git a/src/common/resourc2.cpp b/src/common/resourc2.cpp
index e08516d3b1..3b378ec002 100644
--- a/src/common/resourc2.cpp
+++ b/src/common/resourc2.cpp
@@ -22,7 +22,7 @@
 
 #if wxUSE_WX_RESOURCES
 
-#ifdef _MSC_VER
+#ifdef __VISUALC__
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
@@ -76,7 +76,7 @@
 
 #include "wx/settings.h"
 
-#if (defined(__BORLANDC__) && defined(__WIN16__))
+#if ((defined(__BORLANDC__) || defined(__SC__)) && defined(__WIN16__))
 
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
@@ -704,7 +704,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
-    if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
+    if ((item->GetType() == "") || (item->GetType() != "wxBitmap"))
     {
       wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
       return wxNullBitmap;
@@ -817,7 +817,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
@@ -826,9 +825,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
           return wxNullBitmap;
         }
         return wxBitmap(item->GetValue1());
-#else
-        wxLogWarning(_("No XPM facility available!"));
-#endif
         break;
       }
       default:
@@ -859,7 +855,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
-    if ((item->GetType() == "") || strcmp(item->GetType(), "wxIcon") != 0)
+    if ((item->GetType() == "") || (item->GetType() != "wxIcon"))
     {
       wxLogWarning(_("%s not an icon resource specification."), (const char*) resource);
       return wxNullIcon;
@@ -974,7 +970,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
       {
       // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
 /*
-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
@@ -984,9 +979,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
           return NULL;
         }
         return wxIcon((char **)item->GetValue1());
-#else
-        wxLogWarning(_("No XPM facility available!"));
-#endif
 */
         wxLogWarning(_("No XPM icon facility available!"));
         break;
@@ -1482,7 +1474,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
 
   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
-  if (!resource || !resource->GetType() ||
+  if (!resource || (resource->GetType() == "") ||
     ! ((strcmp(resource->GetType(), "wxDialog") == 0) || (strcmp(resource->GetType(), "wxPanel") == 0)))
     return FALSE;
 
@@ -1521,7 +1513,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
   if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
   {
     // No need to do this since it's done in wxPanel or wxDialog constructor.
-    // SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+    // SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   }
   else
   {
@@ -1533,9 +1525,9 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
 
   // Should have some kind of font at this point
   if (!GetFont().Ok())
-      SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+      SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
   if (!GetBackgroundColour().Ok())
-      SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
+      SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
 
   // Only when we've created the window and set the font can we set the correct size,
   // if based on dialog units.
@@ -1545,6 +1537,10 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
     SetClientSize(sz.x, sz.y);
 
     wxPoint pt = ConvertDialogToPixels(wxPoint(x, y));
+    #ifdef __WXMAC__
+    int mbarheight = 2 * LMGetMBarHeight() ;
+ 		pt.y += mbarheight ;
+    #endif
     Move(pt.x, pt.y);
   }
 
@@ -1568,7 +1564,7 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
-#ifdef _MSC_VER
+#ifdef __VISUALC__
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++