Improved selection mode handling in wxGrid::SelectBlock

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

diff --git a/src/common/resourc2.cpp b/src/common/resourc2.cpp
index 4bee887ddb459fda7c1c3ac5ef5eb1537cffe425..7774e5a7c51a6d61dbfab18caa03ceb5ad276e43 100644 (file)
--- a/src/common/resourc2.cpp
+++ b/src/common/resourc2.cpp
@@ -22,7 +22,7 @@
 
 #if wxUSE_WX_RESOURCES
 
 
 #if wxUSE_WX_RESOURCES
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(disable:4706)   // assignment within conditional expression
 #endif // VC++
 


@@ -1545,6 +1545,10 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
     SetClientSize(sz.x, sz.y);
 
     wxPoint pt = ConvertDialogToPixels(wxPoint(x, y));
     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);
   }
 
     Move(pt.x, pt.y);
   }
 


@@ -1568,7 +1572,7 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

-#ifdef _MSC_VER
+#ifdef __VISUALC__

     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++