0. wxExecute() with IO redirection now works again (but the real fix is

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

diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp
index 8fc614cff74c147a1c6b6482fa58bf797cd8fb1f..2cae01b8c32603e420d0312b0e2625348e458cc6 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -72,7 +72,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
                                      UINT uiMsg,
 
 UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
                                      UINT uiMsg,

-                                     WPARAM wParam,
+                                     WPARAM WXUNUSED(wParam),

                                      LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )
                                      LPARAM lParam)
 {
     if ( uiMsg == WM_INITDIALOG )


@@ -81,6 +81,14 @@ UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
         ::SetWindowText(hwnd, dialog->GetTitle());
         wxColourDialog *dialog = (wxColourDialog *)pCC->lCustData;
 
         ::SetWindowText(hwnd, dialog->GetTitle());

+
+        wxPoint pos = dialog->GetPosition();
+        if ( pos != wxDefaultPosition )
+        {
+            ::SetWindowPos(hwnd, NULL /* Z-order: ignored */,
+                           pos.x, pos.y, -1, -1,
+                           SWP_NOSIZE | SWP_NOZORDER);
+        }

     }
 
     return 0;
     }
 
     return 0;


@@ -92,10 +100,13 @@ UINT CALLBACK wxColourDialogHookProc(HWND hwnd,
 
 wxColourDialog::wxColourDialog()
 {
 
 wxColourDialog::wxColourDialog()
 {

+    m_pos = wxDefaultPosition;

 }
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 {
 }
 
 wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
 {

+    m_pos = wxDefaultPosition;
+

     Create(parent, data);
 }
 
     Create(parent, data);
 }
 


@@ -164,7 +175,7 @@ void wxColourDialog::SetTitle(const wxString& title)
     m_title = title;
 }
 
     m_title = title;
 }
 

-wxString wxColourDialog::GetTitle()
+wxString wxColourDialog::GetTitle() const

 {
     return m_title;
 }
 {
     return m_title;
 }


@@ -173,11 +184,25 @@ wxString wxColourDialog::GetTitle()
 // position/size
 // ----------------------------------------------------------------------------
 
 // position/size
 // ----------------------------------------------------------------------------
 

-void wxColourDialog::DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
+void wxColourDialog::DoGetPosition(int *x, int *y) const
+{
+    if ( x )
+        *x = m_pos.x;
+    if ( y )
+        *y = m_pos.y;
+}
+
+void wxColourDialog::DoSetSize(int x, int y,

                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {
                                int WXUNUSED(width), int WXUNUSED(height),
                                int WXUNUSED(sizeFlags))
 {

-    // ignore - we can't change the size of this standard dialog
+    if ( x != -1 )
+        m_pos.x = x;
+
+    if ( y != -1 )
+        m_pos.y = y;
+
+    // ignore the size params - we can't change the size of a standard dialog

     return;
 }
 
     return;
 }
 


@@ -200,3 +225,4 @@ void wxColourDialog::DoGetClientSize(int *width, int *height) const
     if ( height )
         *height = 299;
 }
     if ( height )
         *height = 299;
 }

+