Added style parameter to wxPopupWindow ctors so they match the Create method.

[wxWidgets.git] / src / mgl / utils.cpp

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 7ad8f8af4f2277f8febdb5b208a1d5a8e5717f83..3017bbf4f3c7b0141440449a47a4cd15ff17f044 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -47,16 +47,26 @@ void wxDisplaySize(int *width, int *height)
     if (height) *height = g_displayDC->sizey();
 }
 
     if (height) *height = g_displayDC->sizey();
 }
 

-void wxGetMousePosition(int* x, int* y)
+void wxDisplaySizeMM(int *width, int *height)

 {
 {

-    MS_getPos(x, y);
+    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    if ( width ) 
+        *width = g_displayDC->sizex() * 25/72;
+    if ( height ) 
+        *height = g_displayDC->sizey() * 25/72;
+    // FIXME_MGL -- what about returning *real* monitor dimensions?

 }
 
 }
 

-wxPoint wxGetMousePosition()
+void wxClientDisplayRect(int *x, int *y, int *width, int *height)

 {
 {

-    wxPoint pt;
-    wxGetMousePosition(&pt.x, &pt.y);
-    return pt;
+    // This is supposed to return desktop dimensions minus any window
+    // manager panels, menus, taskbars, etc.  If there is a way to do that
+    // for this platform please fix this function, otherwise it defaults
+    // to the entire desktop.
+    if (x) *x = 0;
+    if (y) *y = 0;
+    wxDisplaySize(width, height);
+    // FIXME_MGL -- make it use wxDesktop class when there's one

 }
 
 bool wxColourDisplay()
 }
 
 bool wxColourDisplay()


@@ -75,20 +85,41 @@ int wxDisplayDepth()
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-#if 0 // FIXME_MGL
-        // FIXME_MGL : fix wxGetOsVersion, too
-  if (majorVsn) *majorVsn = GTK_MAJOR_VERSION;
-  if (minorVsn) *minorVsn = GTK_MINOR_VERSION;
-
-  return wxGTK;
+  if ( majorVsn )
+      *majorVsn = MGL_RELEASE_MAJOR;
+  if ( minorVsn )
+      *minorVsn = MGL_RELEASE_MINOR;
+
+#if defined(__UNIX__)
+  return wxMGL_UNIX;
+#elif defined(__OS2__)
+  return wxMGL_OS2;
+#elif defined(__WIN32__)
+  return wxMGL_WIN32;

 #endif
 }
 
 
 #endif
 }
 
 

+void wxGetMousePosition(int* x, int* y)
+{
+    MS_getPos(x, y);
+}
+
+wxPoint wxGetMousePosition()
+{
+    wxPoint pt;
+    wxGetMousePosition(&pt.x, &pt.y);
+    return pt;
+}
+
+
+

 #ifdef __UNIX__
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 #ifdef __UNIX__
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {

+    wxFAIL_MSG(wxT("wxAddProcessCallback not implemented in wxMGL!"));
+    return 0;

 #if 0 // FIXME_MGL -do we need it at all?
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,
 #if 0 // FIXME_MGL -do we need it at all?
     int tag = gdk_input_add(fd,
                             GDK_INPUT_READ,