fix bug with adding entries to a root group containing only subgroups (as shown by...

[wxWidgets.git] / src / x11 / dcclient.cpp

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 5e3b5728cbd6ed54a3f48069ad7f0680cdfef7eb..63932ca5b9fcdd39fdf448635278518465690cf8 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -18,16 +18,15 @@
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"
     #include "wx/app.h"
     #include "wx/window.h"
     #include "wx/dcmemory.h"

+    #include "wx/math.h"
+    #include "wx/image.h"
+    #include "wx/module.h"

 #endif
 
 #endif
 

-#include "wx/image.h"
-#include "wx/module.h"

 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"
 
 #include "wx/fontutil.h"
 
 #include "wx/x11/private.h"
 

-#include "wx/math.h"
-

 #if wxUSE_UNICODE
 #include "glib.h"
 #include "pango/pangox.h"
 #if wxUSE_UNICODE
 #include "glib.h"
 #include "pango/pangox.h"


@@ -42,7 +41,8 @@
 // local defines
 //-----------------------------------------------------------------------------
 
 // local defines
 //-----------------------------------------------------------------------------
 

-#define USE_PAINT_REGION 1
+// VZ: what is this for exactly??
+#define USE_PAINT_REGION 0

 
 //-----------------------------------------------------------------------------
 // local data
 
 //-----------------------------------------------------------------------------
 // local data


@@ -166,7 +166,7 @@ static void wxFreePoolGC( GC gc )
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
 

-wxWindowDC::wxWindowDC()
+void wxWindowDC::Init()

 {
     m_display = (WXDisplay *) NULL;
     m_penGC = (WXGC *) NULL;
 {
     m_display = (WXDisplay *) NULL;
     m_penGC = (WXGC *) NULL;


@@ -179,7 +179,7 @@ wxWindowDC::wxWindowDC()
     m_owner = (wxWindow *)NULL;
 
 #if wxUSE_UNICODE
     m_owner = (wxWindow *)NULL;
 
 #if wxUSE_UNICODE

-    m_context = (PangoContext *)NULL;
+    m_context = wxTheApp->GetPangoContext();

     m_fontdesc = (PangoFontDescription *)NULL;
 #endif
 }
     m_fontdesc = (PangoFontDescription *)NULL;
 #endif
 }


@@ -188,15 +188,8 @@ wxWindowDC::wxWindowDC( wxWindow *window )
 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 
 {
     wxASSERT_MSG( window, wxT("DC needs a window") );
 

-    m_display = (WXDisplay *) NULL;
-    m_penGC = (WXGC *) NULL;
-    m_brushGC = (WXGC *) NULL;
-    m_textGC = (WXGC *) NULL;
-    m_bgGC = (WXGC *) NULL;
-    m_cmap = (WXColormap *) NULL;
-    m_owner = (wxWindow *)NULL;
-    m_isMemDC = false;
-    m_isScreenDC = false;
+    Init();
+

     m_font = window->GetFont();
 
     m_window = (WXWindow*) window->GetMainWindow();
     m_font = window->GetFont();
 
     m_window = (WXWindow*) window->GetMainWindow();


@@ -213,7 +206,6 @@ wxWindowDC::wxWindowDC( wxWindow *window )
     m_display = (WXDisplay *) wxGlobalDisplay();
 
 #if wxUSE_UNICODE
     m_display = (WXDisplay *) wxGlobalDisplay();
 
 #if wxUSE_UNICODE

-    m_context = wxTheApp->GetPangoContext();

     m_fontdesc = window->GetFont().GetNativeFontInfo()->description;
 #endif
 
     m_fontdesc = window->GetFont().GetNativeFontInfo()->description;
 #endif
 


@@ -1285,8 +1277,8 @@ bool wxWindowDC::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
     if (!m_window) return false;
 
     // transform the source DC coords to the device ones
     if (!m_window) return false;
 
     // transform the source DC coords to the device ones

-    xsrc = source->XLOG2DEV(xsrc);
-    ysrc = source->YLOG2DEV(ysrc);
+    xsrc = source->LogicalToDeviceX(xsrc);
+    ysrc = source->LogicalToDeviceY(ysrc);

 
     wxClientDC *srcDC = (wxClientDC*)source;
     wxMemoryDC *memDC = (wxMemoryDC*)source;
 
     wxClientDC *srcDC = (wxClientDC*)source;
     wxMemoryDC *memDC = (wxMemoryDC*)source;


@@ -1572,7 +1564,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
         slen = strlen(text);
         XCharStruct overall_return;
 
         slen = strlen(text);
         XCharStruct overall_return;
 

-        (void)XTextExtents(xfont, (char*) text.c_str(), slen, &direction,
+        (void)XTextExtents(xfont, (const char*) text.c_str(), slen, &direction,

                                  &ascent, &descent, &overall_return);
 
         cx = overall_return.width;
                                  &ascent, &descent, &overall_return);
 
         cx = overall_return.width;


@@ -1594,7 +1586,7 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
 #endif
     {
         XDrawString( (Display*) m_display, (Window) m_window,
 #endif
     {
         XDrawString( (Display*) m_display, (Window) m_window,

-            (GC) m_textGC, x, y + XFontStructGetAscent(xfont), text.c_str(), text.Len() );
+            (GC) m_textGC, x, y + XFontStructGetAscent(xfont), text.c_str(), text.length() );

     }
 
 #if 0
     }
 
 #if 0


@@ -1621,7 +1613,7 @@ void wxWindowDC::DoDrawRotatedText( const wxString &text, wxCoord x, wxCoord y,
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,
 
 void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *height,
                                 wxCoord *descent, wxCoord *externalLeading,

-                                wxFont *font ) const
+                                const wxFont *font ) const

 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
 
 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
 


@@ -1670,7 +1662,7 @@ void wxWindowDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoor
     int direction, ascent, descent2;
     XCharStruct overall;
 
     int direction, ascent, descent2;
     XCharStruct overall;
 

-    XTextExtents( xfont, (char*) string.c_str(), string.Len(), &direction,
+    XTextExtents( xfont, (const char*) string.c_str(), string.length(), &direction,

         &ascent, &descent2, &overall);
 
     if (width)
         &ascent, &descent2, &overall);
 
     if (width)


@@ -1788,8 +1780,6 @@ void wxWindowDC::SetFont( const wxFont &font )
 
     m_font = font;
 
 
     m_font = font;
 

-    return;
-

 #if wxUSE_UNICODE
     m_fontdesc = font.GetNativeFontInfo()->description;
 #endif
 #if wxUSE_UNICODE
     m_fontdesc = font.GetNativeFontInfo()->description;
 #endif


@@ -2170,19 +2160,25 @@ void wxWindowDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoo
 
     if (!m_window) return;
 
 
     if (!m_window) return;
 

+    if (width <= 0)
+        width = 1;
+
+    if (height <= 0)
+        height = 1;
+

     wxRect rect;
     rect.x = XLOG2DEV(x);
     rect.y = YLOG2DEV(y);
     rect.width = XLOG2DEVREL(width);
     rect.height = YLOG2DEVREL(height);
 
     wxRect rect;
     rect.x = XLOG2DEV(x);
     rect.y = YLOG2DEV(y);
     rect.width = XLOG2DEVREL(width);
     rect.height = YLOG2DEVREL(height);
 

-    if (!m_currentClippingRegion.IsNull())
+    if (!m_currentClippingRegion.IsEmpty())

         m_currentClippingRegion.Intersect( rect );
     else
         m_currentClippingRegion.Intersect( rect );
     else

-        m_currentClippingRegion.Union( rect );
+        m_currentClippingRegion = rect;

 
 #if USE_PAINT_REGION
 
 #if USE_PAINT_REGION

-    if (!m_paintClippingRegion.IsNull())
+    if (!m_paintClippingRegion.IsEmpty())

         m_currentClippingRegion.Intersect( m_paintClippingRegion );
 #endif
 
         m_currentClippingRegion.Intersect( m_paintClippingRegion );
 #endif
 


@@ -2208,13 +2204,13 @@ void wxWindowDC::DoSetClippingRegionAsRegion( const wxRegion& region )
 
     if (!m_window) return;
 
 
     if (!m_window) return;
 

-    if (!m_currentClippingRegion.IsNull())
+    if (!m_currentClippingRegion.IsEmpty())

         m_currentClippingRegion.Intersect( region );
     else
         m_currentClippingRegion.Intersect( region );
     else

-        m_currentClippingRegion.Union( region );
+        m_currentClippingRegion = region;

 
 #if USE_PAINT_REGION
 
 #if USE_PAINT_REGION

-    if (!m_paintClippingRegion.IsNull())
+    if (!m_paintClippingRegion.IsEmpty())

         m_currentClippingRegion.Intersect( m_paintClippingRegion );
 #endif
 
         m_currentClippingRegion.Intersect( m_paintClippingRegion );
 #endif
 


@@ -2367,8 +2363,15 @@ wxPaintDC::wxPaintDC(wxWindow* window)
 class wxDCModule : public wxModule
 {
 public:
 class wxDCModule : public wxModule
 {
 public:

-    bool OnInit();
-    void OnExit();
+    // we must be cleaned up before wxDisplayModule which closes the global
+    // display
+    wxDCModule()
+    {
+        AddDependency(wxClassInfo::FindClass(_T("wxX11DisplayModule")));
+    }
+
+    bool OnInit() { wxInitGCPool(); return true; }
+    void OnExit() { wxCleanUpGCPool(); }

 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxDCModule)


@@ -2376,13 +2379,3 @@ private:
 
 IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxDCModule, wxModule)
 

-bool wxDCModule::OnInit()
-{
-    wxInitGCPool();
-    return true;
-}
-
-void wxDCModule::OnExit()
-{
-    wxCleanUpGCPool();
-}