fix for using wxDataObjectComposite with the clipboard

[wxWidgets.git] / src / msw / dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 9ae185092d871c368bdf00e4c2b7c7498c1b3794..ac887e8c85b402bf88938ecb512e06eb3971cd48 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -41,7 +41,7 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
 #include "wx/msw/private.h"
 #include "wx/log.h"
 

-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)

     #include <commdlg.h>
 #endif
 
     #include <commdlg.h>
 #endif
 


@@ -61,12 +61,6 @@
 // globals
 // ----------------------------------------------------------------------------
 
 // globals
 // ----------------------------------------------------------------------------
 

-// all objects to be deleted during next idle processing - from window.cpp
-extern wxList WXDLLEXPORT wxPendingDelete;
-
-// all frames and modeless dialogs - not static, used in frame.cpp, mdi.cpp &c
-wxWindowList wxModelessWindows;
-

 // all modal dialogs currently shown
 static wxWindowList wxModalDialogs;
 
 // all modal dialogs currently shown
 static wxWindowList wxModalDialogs;
 


@@ -74,9 +68,9 @@ static wxWindowList wxModalDialogs;
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxPanel)
+IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)

 
 

-BEGIN_EVENT_TABLE(wxDialog, wxPanel)
+BEGIN_EVENT_TABLE(wxDialog, wxTopLevelWindow)

     EVT_BUTTON(wxID_OK, wxDialog::OnOK)
     EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
     EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
     EVT_BUTTON(wxID_OK, wxDialog::OnOK)
     EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
     EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)


@@ -107,7 +101,8 @@ void wxDialog::Init()
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
 }
 

-bool wxDialog::Create(wxWindow *parent, wxWindowID id,
+bool wxDialog::Create(wxWindow *parent,
+                      wxWindowID id,

                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size,
                       const wxString& title,
                       const wxPoint& pos,
                       const wxSize& size,


@@ -116,77 +111,17 @@ bool wxDialog::Create(wxWindow *parent, wxWindowID id,
 {
     Init();
 
 {
     Init();
 

-    m_oldFocus = FindFocus();
-
-    SetName(name);
-
-    wxTopLevelWindows.Append(this);
-
-    //  windowFont = wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL);
-
-    if (parent) parent->AddChild(this);
-
-    if ( id == -1 )
-        m_windowId = (int)NewControlId();
-    else
-        m_windowId = id;
-
-    int x = pos.x;
-    int y = pos.y;
-    int width = size.x;
-    int height = size.y;
-
-    if (x < 0)
-        x = wxDIALOG_DEFAULT_X;
-    if (y < 0)
-        y = wxDIALOG_DEFAULT_Y;
-
-    m_windowStyle = style;
+    SetExtraStyle(GetExtraStyle() | wxTOPLEVEL_EX_DIALOG);

 
 

-    if (width < 0)
-        width = wxDIALOG_DEFAULT_WIDTH;
-    if (height < 0)
-        height = wxDIALOG_DEFAULT_HEIGHT;
+    // save focus before doing anything which can potentially change it
+    m_oldFocus = FindFocus();

 
     // All dialogs should really have this style
 
     // All dialogs should really have this style

-    m_windowStyle |= wxTAB_TRAVERSAL;
-
-    WXDWORD extendedStyle = MakeExtendedStyle(m_windowStyle);
-    if (m_windowStyle & wxSTAY_ON_TOP)
-        extendedStyle |= WS_EX_TOPMOST;
-
-#ifndef __WIN16__
-    if (m_exStyle & wxDIALOG_EX_CONTEXTHELP)
-        extendedStyle |= WS_EX_CONTEXTHELP;
-#endif
-    // Allows creation of dialogs with & without captions under MSWindows,
-    // resizeable or not (but a resizeable dialog always has caption -
-    // otherwise it would look too strange)
-    const wxChar *dlg;
-    if ( style & wxRESIZE_BORDER )
-        dlg = wxT("wxResizeableDialog");
-    else if ( style & wxCAPTION )
-        dlg = wxT("wxCaptionDialog");
-    else
-        dlg = wxT("wxNoCaptionDialog");
-    MSWCreate(m_windowId, parent, NULL, this, NULL,
-              x, y, width, height,
-              0, // style is not used if we have dlg template
-              dlg,
-              extendedStyle);
-
-    HWND hwnd = (HWND)GetHWND();
-
-    if ( !hwnd )
-    {
-        wxFAIL_MSG(_("Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your resources."));
+    style |= wxTAB_TRAVERSAL;

 
 

+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )

         return FALSE;
         return FALSE;

-    }
-
-    SubclassWin(GetHWND());

 
 

-    SetWindowText(hwnd, title);

     SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 
     return TRUE;
     SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 
     return TRUE;


@@ -212,24 +147,8 @@ wxDialog::~wxDialog()
 {
     m_isBeingDeleted = TRUE;
 
 {
     m_isBeingDeleted = TRUE;
 

-    wxTopLevelWindows.DeleteObject(this);
-

     // this will also reenable all the other windows for a modal dialog
     Show(FALSE);
     // this will also reenable all the other windows for a modal dialog
     Show(FALSE);

-
-    if ( !IsModal() )
-        wxModelessWindows.DeleteObject(this);
-
-    // If this is the last top-level window, exit.
-    if ( wxTheApp && (wxTopLevelWindows.Number() == 0) )
-    {
-        wxTheApp->SetTopWindow(NULL);
-
-        if ( wxTheApp->GetExitOnFrameDelete() )
-        {
-            ::PostQuitMessage(0);
-        }
-    }

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


@@ -261,56 +180,6 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-// ----------------------------------------------------------------------------
-// Windows dialog boxes can't be iconized
-// ----------------------------------------------------------------------------
-
-void wxDialog::Iconize(bool WXUNUSED(iconize))
-{
-}
-
-bool wxDialog::IsIconized() const
-{
-    return FALSE;
-}
-
-// ----------------------------------------------------------------------------
-// size/position handling
-// ----------------------------------------------------------------------------
-
-void wxDialog::DoSetClientSize(int width, int height)
-{
-    HWND hWnd = (HWND) GetHWND();
-    RECT rect;
-    ::GetClientRect(hWnd, &rect);
-
-    RECT rect2;
-    GetWindowRect(hWnd, &rect2);
-
-    // Find the difference between the entire window (title bar and all)
-    // and the client area; add this to the new client size to move the
-    // window
-    int actual_width = rect2.right - rect2.left - rect.right + width;
-    int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
-
-    MoveWindow(hWnd, rect2.left, rect2.top, actual_width, actual_height, TRUE);
-
-    wxSizeEvent event(wxSize(actual_width, actual_height), m_windowId);
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent(event);
-}
-
-void wxDialog::DoGetPosition(int *x, int *y) const
-{
-    RECT rect;
-    GetWindowRect(GetHwnd(), &rect);
-
-    if ( x )
-        *x = rect.left;
-    if ( y )
-        *y = rect.top;
-}
-

 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------


@@ -370,11 +239,6 @@ void wxDialog::DoShowModal()
         wxTheApp->DoMessage();
     }
 
         wxTheApp->DoMessage();
     }
 

-#if 0 //def __WIN32__
-    if ( parent )
-        ::SetActiveWindow(GetHwndOf(parent));
-#endif // __WIN32__
-

     // and restore focus
     // Note that this code MUST NOT access the dialog object's data
     // in case the object has been deleted (which will be the case
     // and restore focus
     // Note that this code MUST NOT access the dialog object's data
     // in case the object has been deleted (which will be the case


@@ -469,7 +333,7 @@ void wxDialog::EndModal(int retCode)
 // ----------------------------------------------------------------------------
 
 // Standard buttons
 // ----------------------------------------------------------------------------
 
 // Standard buttons

-void wxDialog::OnOK(wxCommandEvent& event)
+void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))

 {
   if ( Validate() && TransferDataFromWindow() )
   {
 {
   if ( Validate() && TransferDataFromWindow() )
   {


@@ -477,7 +341,7 @@ void wxDialog::OnOK(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxDialog::OnApply(wxCommandEvent& event)
+void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))

 {
     if ( Validate() )
         TransferDataFromWindow();
 {
     if ( Validate() )
         TransferDataFromWindow();


@@ -485,12 +349,12 @@ void wxDialog::OnApply(wxCommandEvent& event)
     // TODO probably need to disable the Apply button until things change again
 }
 
     // TODO probably need to disable the Apply button until things change again
 }
 

-void wxDialog::OnCancel(wxCommandEvent& event)
+void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))

 {
     EndModal(wxID_CANCEL);
 }
 
 {
     EndModal(wxID_CANCEL);
 }
 

-void wxDialog::OnCloseWindow(wxCloseEvent& event)
+void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
     // We'll send a Cancel message by default, which may close the dialog.
     // Check for looping if the Cancel event handler calls Close().
 {
     // We'll send a Cancel message by default, which may close the dialog.
     // Check for looping if the Cancel event handler calls Close().


@@ -520,18 +384,7 @@ void wxDialog::OnCloseWindow(wxCloseEvent& event)
     closing.DeleteObject(this);
 }
 
     closing.DeleteObject(this);
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxDialog::Destroy()
-{
-    wxCHECK_MSG( !wxPendingDelete.Member(this), FALSE,
-                 _T("wxDialog destroyed twice") );
-
-    wxPendingDelete.Append(this);
-
-    return TRUE;
-}
-
-void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))

 {
 #if wxUSE_CTL3D
     Ctl3dColorChange();
 {
 #if wxUSE_CTL3D
     Ctl3dColorChange();


@@ -587,6 +440,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             processed = !Close();
             break;
 
             processed = !Close();
             break;
 

+#ifndef __WXMICROWIN__

         case WM_SETCURSOR:
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
         case WM_SETCURSOR:
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog


@@ -612,6 +466,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 rc = FALSE;
             }
             break;
                 rc = FALSE;
             }
             break;

+#endif // __WXMICROWIN__

     }
 
     if ( !processed )
     }
 
     if ( !processed )