Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

[wxWidgets.git] / interface / wx / clipbrd.h

diff --git a/interface/wx/clipbrd.h b/interface/wx/clipbrd.h
index ca3dec1783bfa09b51b932e5a2d5a44922c709c9..2a51212c6346e2c1c92bf69df40f7f98c90424c0 100644 (file)
--- a/interface/wx/clipbrd.h
+++ b/interface/wx/clipbrd.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxClipboard
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxClipboard
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -35,7 +35,7 @@
     // Write some text to the clipboard
     if (wxTheClipboard->Open())
     {
     // Write some text to the clipboard
     if (wxTheClipboard->Open())
     {

-        // This data objects are held by the clipboard, 
+        // This data objects are held by the clipboard,

         // so do not delete them in the app.
         wxTheClipboard->SetData( new wxTextDataObject("Some text") );
         wxTheClipboard->Close();
         // so do not delete them in the app.
         wxTheClipboard->SetData( new wxTextDataObject("Some text") );
         wxTheClipboard->Close();


@@ -49,7 +49,7 @@
             wxTextDataObject data;
             wxTheClipboard->GetData( data );
             wxMessageBox( data.GetText() );
             wxTextDataObject data;
             wxTheClipboard->GetData( data );
             wxMessageBox( data.GetText() );

-        }  
+        }

         wxTheClipboard->Close();
     }
     @endcode
         wxTheClipboard->Close();
     }
     @endcode


@@ -173,6 +173,6 @@ public:
         normal clipboard contents with the currently selected text on the other
         platforms.
     */
         normal clipboard contents with the currently selected text on the other
         platforms.
     */

-    void UsePrimarySelection(bool primary = true);
+    virtual void UsePrimarySelection(bool primary = false);

 };
 
 };