Renamed internal GetClientWindow to GetClientAreaWindow so

as not to clash with the MDI function of the same name

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

diff --git a/include/wx/x11/window.h b/include/wx/x11/window.h
index feace83629c6736762616ab635cd0c45b61109f1..f6c76873d3413c666bab07a9d6138682d49be0a9 100644 (file)
--- a/include/wx/x11/window.h
+++ b/include/wx/x11/window.h
@@ -107,8 +107,8 @@ public:
     virtual WXWindow GetMainWindow() const;
     
     // Get X11 window representing the client area
     virtual WXWindow GetMainWindow() const;
     
     // Get X11 window representing the client area

-    virtual WXWindow GetClientWindow() const;
-    
+    virtual WXWindow GetClientAreaWindow() const;
+

     void SetLastClick(int button, long timestamp)
         { m_lastButton = button; m_lastTS = timestamp; }
     
     void SetLastClick(int button, long timestamp)
         { m_lastButton = button; m_lastTS = timestamp; }
     

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 2f2a28be2916bc97bff4b3523a77320d12bf28b9..dfdb22215853e237a5f920c3689aace39a689b3c 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -514,7 +514,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX
         case Expose:
         {
 #if wxUSE_TWO_WINDOWS && !wxUSE_NANOX

-            if (event->xexpose.window != (Window)win->GetClientWindow())
+            if (event->xexpose.window != (Window)win->GetClientAreaWindow())

             {
                 XEvent tmp_event;
                 wxExposeInfo info;
             {
                 XEvent tmp_event;
                 wxExposeInfo info;


@@ -556,7 +556,7 @@ bool wxApp::ProcessXEvent(WXEvent* _event)
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.
 
                 // If we only have one X11 window, always indicate
                 // that borders might have to be redrawn.

-                if (win->GetMainWindow() == win->GetClientWindow())
+                if (win->GetMainWindow() == win->GetClientAreaWindow())

                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.
                     win->NeedUpdateNcAreaInIdle();
 
                 // Only erase background, paint in idle time.

diff --git a/src/x11/dcclient.cpp b/src/x11/dcclient.cpp
index 200762065f47fd222611edb9c9f24b4699418d69..8693ee3f4c675aee97e5b3863c84c7fe0b7a1e05 100644 (file)
--- a/src/x11/dcclient.cpp
+++ b/src/x11/dcclient.cpp
@@ -2044,7 +2044,7 @@ wxClientDC::wxClientDC( wxWindow *window )
 {
     wxCHECK_RET( window, _T("NULL window in wxClientDC::wxClientDC") );
     
 {
     wxCHECK_RET( window, _T("NULL window in wxClientDC::wxClientDC") );
     

-    m_window = (WXWindow*) window->GetClientWindow();
+    m_window = (WXWindow*) window->GetClientAreaWindow();

     
 #if wxUSE_TWO_WINDOWS
 #else
     
 #if wxUSE_TWO_WINDOWS
 #else

diff --git a/src/x11/glcanvas.cpp b/src/x11/glcanvas.cpp
index 1354afb71072a17f0bb6acfe56acdf98216513b7..c7bf78eb39db7065bda84a847daba3e25d0713fc 100644 (file)
--- a/src/x11/glcanvas.cpp
+++ b/src/x11/glcanvas.cpp
@@ -108,7 +108,7 @@ void wxGLContext::SwapBuffers()
     if (m_glContext)
     {
         Display* display = (Display*) wxGetDisplay();
     if (m_glContext)
     {
         Display* display = (Display*) wxGetDisplay();

-        glXSwapBuffers(display, (Window) m_window->GetClientWindow());
+        glXSwapBuffers(display, (Window) m_window->GetClientAreaWindow());

     }
 }
 
     }
 }
 


@@ -117,7 +117,7 @@ void wxGLContext::SetCurrent()
     if (m_glContext) 
     { 
         Display* display = (Display*) wxGetDisplay();
     if (m_glContext) 
     { 
         Display* display = (Display*) wxGetDisplay();

-        glXMakeCurrent(display, (Window) m_window->GetClientWindow(), 
+        glXMakeCurrent(display, (Window) m_window->GetClientAreaWindow(), 

                        m_glContext );;
     }
 }
                        m_glContext );;
     }
 }


@@ -294,7 +294,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
     } else {
        // By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?
     } else {
        // By default, we use the visual of xwindow
         // NI: is this really senseful ? opengl in e.g. color index mode ?

-       XGetWindowAttributes(display, (Window) GetClientWindow(), &xwa);
+       XGetWindowAttributes(display, (Window) GetClientAreaWindow(), &xwa);

        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        if(!vi) return false;
        vi_templ.visualid = XVisualIDFromVisual(xwa.visual);
        vi = XGetVisualInfo(display, VisualIDMask, &vi_templ, &n);
        if(!vi) return false;


@@ -366,7 +366,7 @@ void wxGLCanvas::SwapBuffers()
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SwapBuffers();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientWindow());
+    // if(glx_cx) glXSwapBuffers(display, (Window) GetClientAreaWindow());

 }
 
 void wxGLCanvas::SetCurrent()
 }
 
 void wxGLCanvas::SetCurrent()


@@ -374,7 +374,7 @@ void wxGLCanvas::SetCurrent()
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();
     if( m_glContext ) m_glContext->SetCurrent();
 
     // Display* display = (Display*) GetXDisplay();

-    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientWindow(), glx_cx);
+    // if(glx_cx) glXMakeCurrent(display, (Window) GetClientAreaWindow(), glx_cx);

 }
 
 void wxGLCanvas::SetColour(const char *col)
 }
 
 void wxGLCanvas::SetColour(const char *col)

diff --git a/src/x11/window.cpp b/src/x11/window.cpp
index 9fa7e4d83fc598d9ac8478990fed9f005d8a85f4..9f980f69f5d53c41aae9afe8e28bf22c86b53e17 100644 (file)
--- a/src/x11/window.cpp
+++ b/src/x11/window.cpp
@@ -147,7 +147,7 @@ bool wxWindowX11::Create(wxWindow *parent, wxWindowID id,
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm ); 
 
     m_foregroundColour = *wxBLACK;
     m_foregroundColour.CalcPixel( (WXColormap) cm ); 
 

-    Window xparent = (Window) parent->GetClientWindow();
+    Window xparent = (Window) parent->GetClientAreaWindow();

     
     // Add window's own scrollbars to main window, not to client window
     if (parent->GetInsertIntoMain())
     
     // Add window's own scrollbars to main window, not to client window
     if (parent->GetInsertIntoMain())


@@ -602,7 +602,7 @@ void wxWindowX11::ScrollWindow(int dx, int dy, const wxRect *rect)
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
     
         m_clearRegion.Intersect( 0, 0, cw, ch );
     }
     

-    Window xwindow = (Window) GetClientWindow();
+    Window xwindow = (Window) GetClientAreaWindow();

 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 
 
     wxCHECK_RET( xwindow, wxT("invalid window") );
 


@@ -1129,7 +1129,7 @@ void wxWindowX11::SendEraseEvents()
     if (!GetEventHandler()->ProcessEvent(erase_event) )
     {
         Display *xdisplay = wxGlobalDisplay();
     if (!GetEventHandler()->ProcessEvent(erase_event) )
     {
         Display *xdisplay = wxGlobalDisplay();

-        Window xwindow = (Window) GetClientWindow();
+        Window xwindow = (Window) GetClientAreaWindow();

         XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
         
         wxRegionIterator upd( m_clearRegion );
         XSetForeground( xdisplay, g_eraseGC, m_backgroundColour.GetPixel() );
         
         wxRegionIterator upd( m_clearRegion );


@@ -1327,7 +1327,7 @@ WXWindow wxWindowX11::GetMainWindow() const
     return m_mainWindow;
 }
 
     return m_mainWindow;
 }
 

-WXWindow wxWindowX11::GetClientWindow() const
+WXWindow wxWindowX11::GetClientAreaWindow() const

 {
     return m_clientWindow;
 }
 {
     return m_clientWindow;
 }