wxMGL update

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mgl/settings.h b/include/wx/mgl/settings.h
index 5ecfa01f8e615b4853b048930aff17af5b3b1967..ac1d27041302ab3425a9c6dd0404e9e11af41121 100644 (file)
--- a/include/wx/mgl/settings.h
+++ b/include/wx/mgl/settings.h
@@ -36,6 +36,9 @@ public:
 
     // Get a system metric, e.g. scrollbar size
     static int GetSystemMetric(int index);
 
     // Get a system metric, e.g. scrollbar size
     static int GetSystemMetric(int index);

+    
+    // Return true if the port can draw frame titlebar (i.e. doesn't need wxUniv for it)
+    static bool HasFrameDecorations() { return FALSE; }

 };
 
 #endif
 };
 
 #endif

diff --git a/src/mgl/toplevel.cpp b/src/mgl/toplevel.cpp
index a026f42f92837a0394a521d21603273efab8fd20..49d9d10403af847b6e20c8d2c74fd46819503843 100644 (file)
--- a/src/mgl/toplevel.cpp
+++ b/src/mgl/toplevel.cpp
@@ -28,6 +28,7 @@
 
 #include "wx/defs.h"
 #include "wx/toplevel.h"
 
 #include "wx/defs.h"
 #include "wx/toplevel.h"

+#include "wx/app.h"

 
 // ----------------------------------------------------------------------------
 // idle system
 
 // ----------------------------------------------------------------------------
 // idle system


@@ -50,6 +51,7 @@ extern int g_openDialogs;
 
 void wxTopLevelWindowMGL::Init()
 {
 
 void wxTopLevelWindowMGL::Init()
 {

+    m_isShown = FALSE;

     m_isIconized = FALSE;
     m_isMaximized = FALSE;
     m_fsIsShowing = FALSE;
     m_isIconized = FALSE;
     m_isMaximized = FALSE;
     m_fsIsShowing = FALSE;


@@ -74,14 +76,14 @@ bool wxTopLevelWindowMGL::Create(wxWindow *parent,
         if ( size.y == -1 )
             size.y = sizeDpy.y / 5;
     }
         if ( size.y == -1 )
             size.y = sizeDpy.y / 5;
     }

+    
+    wxWindow::Create(parent, id, pos, sizeOrig, style, name);

 
     wxTopLevelWindows.Append(this);
 
     m_title = title;
 
     wxTopLevelWindows.Append(this);
 
     m_title = title;

-
-
-    if (m_parent) 
-        m_parent->AddChild(this);
+    
+    // FIXME_MGL -- should activate itself when shown!

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -174,7 +176,7 @@ void wxTopLevelWindowMGL::Restore()
 
 void wxTopLevelWindowMGL::Iconize(bool iconize)
 {
 
 void wxTopLevelWindowMGL::Iconize(bool iconize)
 {

-    // FIXME_MGL
+    // FIXME_MGL - use wxDesktop for this

 }
 
 bool wxTopLevelWindowMGL::IsIconized() const
 }
 
 bool wxTopLevelWindowMGL::IsIconized() const

diff --git a/src/mgl/utils.cpp b/src/mgl/utils.cpp
index 5e5409772da363d91934163543cceffb742390b9..3017bbf4f3c7b0141440449a47a4cd15ff17f044 100644 (file)
--- a/src/mgl/utils.cpp
+++ b/src/mgl/utils.cpp
@@ -50,8 +50,10 @@ void wxDisplaySize(int *width, int *height)
 void wxDisplaySizeMM(int *width, int *height)
 {
     wxASSERT_MSG( g_displayDC, wxT("MGL display DC not created yet.") );
 void wxDisplaySizeMM(int *width, int *height)
 {
     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;
+    if ( width ) 
+        *width = g_displayDC->sizex() * 25/72;
+    if ( height ) 
+        *height = g_displayDC->sizey() * 25/72;

     // FIXME_MGL -- what about returning *real* monitor dimensions?
 }
 
     // FIXME_MGL -- what about returning *real* monitor dimensions?
 }
 


@@ -64,6 +66,7 @@ void wxClientDisplayRect(int *x, int *y, int *width, int *height)
     if (x) *x = 0;
     if (y) *y = 0;
     wxDisplaySize(width, height);
     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()


@@ -82,12 +85,17 @@ 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
 }
 


@@ -110,6 +118,8 @@ wxPoint wxGetMousePosition()
 
 int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
 {
 
 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,