Clipboard usage fixes inspired by Tinderbox logs.

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 2ec463d64184b44955346c5ac209e5217763abac..83307773bcc063f82e2a901054da40f9b2f04ae8 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -826,6 +826,8 @@ bool wxHtmlWindow::CopySelection(ClipboardType t)
             return true;
         }
     }
             return true;
         }
     }

+#else
+    wxUnusedVar(t);

 #endif // wxUSE_CLIPBOARD
 
     return false;
 #endif // wxUSE_CLIPBOARD
 
     return false;


@@ -1027,6 +1029,8 @@ void wxHtmlWindow::OnMouseDown(wxMouseEvent& event)
             CaptureMouse();
         }
     }
             CaptureMouse();
         }
     }

+#else
+    wxUnusedVar(event);

 #endif // wxUSE_CLIPBOARD
 }
 
 #endif // wxUSE_CLIPBOARD
 }
 

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 520e547064862e0af3478b81ac0c488ddcfa3c51..e61f41c12ba235bede0695c99d8e1f9d77ff672e 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -574,7 +574,7 @@ bool wxComboBox::CanUndo() const
 {
     if (!IsEditable())
         return false;
 {
     if (!IsEditable())
         return false;

-    
+

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -586,7 +586,7 @@ bool wxComboBox::CanRedo() const
 {
     if (!IsEditable())
         return false;
 {
     if (!IsEditable())
         return false;

-    
+

     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;
     HWND hEditWnd = (HWND) GetEditHWND() ;
     if ( hEditWnd )
         return ::SendMessage(hEditWnd, EM_CANUNDO, 0, 0) != 0;


@@ -697,6 +697,10 @@ void wxComboBox::Replace(long from, long to, const wxString& value)
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);
 
     // Paste into edit control
     SendMessage(GetHwnd(), WM_PASTE, (WPARAM)0, (LPARAM)0L);

+#else
+    wxUnusedVar(from);
+    wxUnusedVar(to);
+    wxUnusedVar(value);

 #endif
 }
 
 #endif
 }
 

diff --git a/src/msw/enhmeta.cpp b/src/msw/enhmeta.cpp
index 621208202c3f19f1c3207e8adb9d543646e8d650..c0063dd5e63c076635887ae22143e2c9a28c79cb 100644 (file)
--- a/src/msw/enhmeta.cpp
+++ b/src/msw/enhmeta.cpp
@@ -120,7 +120,7 @@ void wxEnhMetaFile::Free()
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
     wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );
 bool wxEnhMetaFile::Play(wxDC *dc, wxRect *rectBound)
 {
     wxCHECK_MSG( Ok(), false, _T("can't play invalid enhanced metafile") );

-    wxCHECK_MSG( dc, FALSE, _T("invalid wxDC in wxEnhMetaFile::Play") );
+    wxCHECK_MSG( dc, false, _T("invalid wxDC in wxEnhMetaFile::Play") );

 
     RECT rect;
     if ( rectBound )
 
     RECT rect;
     if ( rectBound )


@@ -180,8 +180,8 @@ wxSize wxEnhMetaFile::GetSize() const
 
 bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {
 
 bool wxEnhMetaFile::SetClipboard(int WXUNUSED(width), int WXUNUSED(height))
 {

-#if wxUSE_DRAG_AND_DROP
-    wxCHECK_MSG( m_hMF, FALSE, _T("can't copy invalid metafile to clipboard") );
+#if wxUSE_DRAG_AND_DROP && wxUSE_CLIPBOARD
+    wxCHECK_MSG( m_hMF, false, _T("can't copy invalid metafile to clipboard") );

 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP
 
     return wxTheClipboard->AddData(new wxEnhMetaFileDataObject(*this));
 #else // !wxUSE_DRAG_AND_DROP


@@ -318,7 +318,7 @@ bool wxEnhMetaFileDataObject::GetDataHere(const wxDataFormat& format, void *buf)
 
         // first get the buffer size and alloc memory
         size_t size = ::GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hdc);
 
         // first get the buffer size and alloc memory
         size_t size = ::GetWinMetaFileBits(hEMF, 0, NULL, MM_ANISOTROPIC, hdc);

-        wxCHECK_MSG( size, FALSE, _T("GetWinMetaFileBits() failed") );
+        wxCHECK_MSG( size, false, _T("GetWinMetaFileBits() failed") );

 
         BYTE *bits = (BYTE *)malloc(size);
 
 
         BYTE *bits = (BYTE *)malloc(size);
 


@@ -366,7 +366,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
     {
         hEMF = *(HENHMETAFILE *)buf;
 
     {
         hEMF = *(HENHMETAFILE *)buf;
 

-        wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+        wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );

     }
     else
     {
     }
     else
     {


@@ -377,7 +377,7 @@ bool wxEnhMetaFileDataObject::SetData(const wxDataFormat& format,
 
         // first get the buffer size
         size_t size = ::GetMetaFileBitsEx(mfpict->hMF, 0, NULL);
 
         // first get the buffer size
         size_t size = ::GetMetaFileBitsEx(mfpict->hMF, 0, NULL);

-        wxCHECK_MSG( size, FALSE, _T("GetMetaFileBitsEx() failed") );
+        wxCHECK_MSG( size, false, _T("GetMetaFileBitsEx() failed") );

 
         // then get metafile bits
         BYTE *bits = (BYTE *)malloc(size);
 
         // then get metafile bits
         BYTE *bits = (BYTE *)malloc(size);


@@ -441,7 +441,7 @@ bool wxEnhMetaFileSimpleDataObject::SetData(size_t WXUNUSED(len),
 {
     HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
 
 {
     HENHMETAFILE hEMF = *(HENHMETAFILE *)buf;
 

-    wxCHECK_MSG( hEMF, FALSE, _T("pasting invalid enh metafile") );
+    wxCHECK_MSG( hEMF, false, _T("pasting invalid enh metafile") );

     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
     return true;
     m_metafile.SetHENHMETAFILE((WXHANDLE)hEMF);
 
     return true;

diff --git a/utils/configtool/src/mainframe.cpp b/utils/configtool/src/mainframe.cpp
index 43247a405cb24aeca080c13d632d306799401611..2e013b6a6f041f508a459bc83ac68bf329eb6d09 100644 (file)
--- a/utils/configtool/src/mainframe.cpp
+++ b/utils/configtool/src/mainframe.cpp
@@ -421,7 +421,9 @@ void ctMainFrame::OnUpdateDisable(wxUpdateUIEvent& event)
 IMPLEMENT_CLASS(ctOutputWindow, wxPanel)
 
 BEGIN_EVENT_TABLE(ctOutputWindow, wxPanel)
 IMPLEMENT_CLASS(ctOutputWindow, wxPanel)
 
 BEGIN_EVENT_TABLE(ctOutputWindow, wxPanel)

+#if wxUSE_CLIPBOARD

     EVT_BUTTON(wxID_COPY, ctOutputWindow::OnCopyToClipboard)
     EVT_BUTTON(wxID_COPY, ctOutputWindow::OnCopyToClipboard)

+#endif // wxUSE_CLIPBOARD

     EVT_BUTTON(wxID_SAVE, ctOutputWindow::OnSaveText)
     EVT_BUTTON(ctID_REGENERATE, ctOutputWindow::OnRegenerate)
     EVT_UPDATE_UI(wxID_SAVE, ctOutputWindow::OnUpdateSaveText)
     EVT_BUTTON(wxID_SAVE, ctOutputWindow::OnSaveText)
     EVT_BUTTON(ctID_REGENERATE, ctOutputWindow::OnRegenerate)
     EVT_UPDATE_UI(wxID_SAVE, ctOutputWindow::OnUpdateSaveText)


@@ -471,6 +473,7 @@ void ctOutputWindow::CreateWindows()
     SetSizer( item0 );
 }
 
     SetSizer( item0 );
 }
 

+#if wxUSE_CLIPBOARD

 /// Copies the text to the clipboard.
 void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
 {
 /// Copies the text to the clipboard.
 void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
 {


@@ -506,6 +509,7 @@ void ctOutputWindow::OnCopyToClipboard(wxCommandEvent& WXUNUSED(event))
         wxTheClipboard->Close();
     }
 }
         wxTheClipboard->Close();
     }
 }

+#endif // wxUSE_CLIPBOARD

 
 /// Sets the code in the text control.
 void ctOutputWindow::SetText(const wxString& text)
 
 /// Sets the code in the text control.
 void ctOutputWindow::SetText(const wxString& text)

diff --git a/utils/configtool/src/mainframe.h b/utils/configtool/src/mainframe.h
index cf240a0dca28c3399a30eb20fafb2e107a08f167..5e9523c267145d5ba316f8f8214b4c4e75d4d6cb 100644 (file)
--- a/utils/configtool/src/mainframe.h
+++ b/utils/configtool/src/mainframe.h
@@ -184,7 +184,9 @@ public:
     void CreateWindows();
 
     /// Copies the text to the clipboard.
     void CreateWindows();
 
     /// Copies the text to the clipboard.

+#if wxUSE_CLIPBOARD

     void OnCopyToClipboard(wxCommandEvent& event);
     void OnCopyToClipboard(wxCommandEvent& event);

+#endif // wxUSE_CLIPBOARD

     void OnUpdateCopy(wxUpdateUIEvent& event);
 
     /// Regenerates setup.h/configure command
     void OnUpdateCopy(wxUpdateUIEvent& event);
 
     /// Regenerates setup.h/configure command