warnings fixed

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

diff --git a/src/x11/clipbrd.cpp b/src/x11/clipbrd.cpp
index e315f5a4ccae5504d9f1a95f75e64ce5f6c449c0..bb143dcc1ff4f7d6587f3a96586b9dc9d62240bd 100644 (file)
--- a/src/x11/clipbrd.cpp
+++ b/src/x11/clipbrd.cpp
@@ -396,9 +396,11 @@ bool wxClipboard::AddData( wxDataObject *data )
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 
     wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
     m_data->GetAllFormats( array );
 

+#if 0

     /* primary selection or clipboard */
     Atom clipboard = m_usePrimary ? (Atom) 1  // 1 = primary selection
                                   : g_clipboardAtom;
     /* primary selection or clipboard */
     Atom clipboard = m_usePrimary ? (Atom) 1  // 1 = primary selection
                                   : g_clipboardAtom;

+#endif // 0

 
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
 
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)

diff --git a/src/x11/toplevel.cpp b/src/x11/toplevel.cpp
index d3a09042d0f0dde28b7cc5477063fef308ecf30a..d191faf6f16906a62ef4727ba4910bc604ba8bbd 100644 (file)
--- a/src/x11/toplevel.cpp
+++ b/src/x11/toplevel.cpp
@@ -606,9 +606,10 @@ void wxTopLevelWindowX11::DoSetSize(int x, int y, int width, int height, int siz
     // wxLogDebug( "Setting pos: %d, %d", x, y );
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 
     // wxLogDebug( "Setting pos: %d, %d", x, y );
     wxWindowX11::DoSetSize(x, y, width, height, sizeFlags);
 

+#if 0

     wxPoint pt = GetPosition();
     // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );
     wxPoint pt = GetPosition();
     // wxLogDebug( "After, pos: %d, %d", pt.x, pt.y );

-#if 0
+

     XSync(wxGlobalDisplay(), False);
     int w, h;
     GetSize(& w, & h);
     XSync(wxGlobalDisplay(), False);
     int w, h;
     GetSize(& w, & h);