use a GtkAlignment to position m_mainWidget, avoiding need to re-size_allocate it

[wxWidgets.git] / src / gtk / clipbrd.cpp

diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index ea30f41d243715f1ec5fb219b91765b8bf521402..3e64f825153b82bd5e2c68eed846c972a894f786 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -80,7 +80,7 @@ public:
 
     // this method must be called by GTK+ callbacks to indicate that we got the
     // result for our clipboard operation
 
     // this method must be called by GTK+ callbacks to indicate that we got the
     // result for our clipboard operation

-    static void OnDone(wxClipboard *clipboard)
+    static void OnDone(wxClipboard * WXUNUSED_UNLESS_DEBUG(clipboard))

     {
         wxASSERT_MSG( clipboard == ms_clipboard,
                         _T("got notification for alien clipboard") );
     {
         wxASSERT_MSG( clipboard == ms_clipboard,
                         _T("got notification for alien clipboard") );


@@ -393,10 +393,8 @@ wxClipboard::~wxClipboard()
 {
     Clear();
 
 {
     Clear();
 

-    if ( m_clipboardWidget )
-        gtk_widget_destroy( m_clipboardWidget );
-    if ( m_targetsWidget )
-        gtk_widget_destroy( m_targetsWidget );
+    gtk_widget_destroy( m_clipboardWidget );
+    gtk_widget_destroy( m_targetsWidget );

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -411,7 +409,7 @@ GdkAtom wxClipboard::GTKGetClipboardAtom() const
 
 void wxClipboard::GTKClearData(Kind kind)
 {
 
 void wxClipboard::GTKClearData(Kind kind)
 {

-    wxDataObject *&data = Data();
+    wxDataObject *&data = Data(kind);

     if ( data )
     {
         delete data;
     if ( data )
     {
         delete data;


@@ -441,7 +439,7 @@ void wxClipboard::AddSupportedTarget(GdkAtom atom)
 {
     gtk_selection_add_target
     (
 {
     gtk_selection_add_target
     (

-        GTK_WIDGET(m_clipboardWidget),
+        m_clipboardWidget,

         GTKGetClipboardAtom(),
         atom,
         0 // info (same as client data) unused
         GTKGetClipboardAtom(),
         atom,
         0 // info (same as client data) unused