fixed wxTaskBarIcon compilation

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

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 95bc72a9ff5b1d45dfea2ff04debeb9675f8244d..6459d48004dab77f1b7c4d9e84c4e004f1594912 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -12,7 +12,6 @@
 
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/intl.h"
 #include "wx/log.h"

-

 #include "wx/process.h"
 
 #include <stdarg.h>
 #include "wx/process.h"
 
 #include <stdarg.h>


@@ -26,6 +25,8 @@
 #include "wx/unix/execute.h"
 #endif
 
 #include "wx/unix/execute.h"
 #endif
 

+#include "wx/mgl/private.h"
+

 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 // misc.
 //----------------------------------------------------------------------------


@@ -39,52 +40,82 @@ void wxBell()
 // display characterstics
 // ----------------------------------------------------------------------------
 
 // display characterstics
 // ----------------------------------------------------------------------------
 

-extern MGLDevCtx *g_displayDC;
+void wxDisplaySize(int *width, int *height)
+{
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+    if (width) *width = g_displayDC->sizex()+1;
+    if (height) *height = g_displayDC->sizey()+1;
+}

 
 

-void wxDisplaySize( int *width, int *height )
+void wxDisplaySizeMM(int *width, int *height)

 {
 {

-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
-    if (width) *width = g_displayDC->sizex();
-    if (height) *height = g_displayDC->sizey();
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );
+    if ( width ) 
+        *width = (g_displayDC->sizex()+1) * 25/72;
+    if ( height ) 
+        *height = (g_displayDC->sizey()+1) * 25/72;
+    // FIXME_MGL -- what about returning *real* monitor dimensions?

 }
 
 }
 

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

 {
 {

-#if 0 // FIXME_MGL
-    gdk_window_get_pointer( (GdkWindow*) NULL, x, y, (GdkModifierType*) NULL );
-#endif
+    if ( x ) *x = 0;
+    if ( y ) *y = 0;
+    wxDisplaySize(width, height);
+    // FIXME_MGL - windowed version needs different handling

 }
 
 bool wxColourDisplay()
 {
 }
 
 bool wxColourDisplay()
 {

-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );

     
     return (wxDisplayDepth() > 1);
 }
 
 int wxDisplayDepth()
 {
     
     return (wxDisplayDepth() > 1);
 }
 
 int wxDisplayDepth()
 {

-    wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
+    wxASSERT_MSG( g_displayDC, wxT("You must call wxApp::SetDisplayMode before using this function") );

 
     return g_displayDC->getBitsPerPixel();
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {
 
     return g_displayDC->getBitsPerPixel();
 }
 
 int wxGetOsVersion(int *majorVsn, int *minorVsn)
 {

-#if 0 // FIXME_MGL
-        // FIXME_MGL : 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,