Small fix for generic print dialog.

[wxWidgets.git] / samples / popup / popup.cpp

diff --git a/samples/popup/popup.cpp b/samples/popup/popup.cpp
index 7fd0d7adc2250e9dc097c0be683bfbb284a69efc..2f2b58f35f5819e96fdc762de29a4ecac5b92670 100644 (file)
--- a/samples/popup/popup.cpp
+++ b/samples/popup/popup.cpp
@@ -127,7 +127,7 @@ SimpleTransientPopup::SimpleTransientPopup( wxWindow *parent ) :
     size.y = m_button->GetRect().GetBottom();
     m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5));
     size.y = m_spinCtrl->GetRect().GetBottom();
     size.y = m_button->GetRect().GetBottom();
     m_spinCtrl = new wxSpinCtrl(m_panel, Minimal_PopupSpinctrl, wxT("Hello"), wxPoint(0, size.y + 5));
     size.y = m_spinCtrl->GetRect().GetBottom();

-    
+

     m_panel->SetSize( size.x+20, size.y+20 );
     SetClientSize( size.x+20, size.y+20 );
 }
     m_panel->SetSize( size.x+20, size.y+20 );
     SetClientSize( size.x+20, size.y+20 );
 }


@@ -138,54 +138,54 @@ SimpleTransientPopup::~SimpleTransientPopup()
 
 void SimpleTransientPopup::Popup(wxWindow *focus)
 {
 
 void SimpleTransientPopup::Popup(wxWindow *focus)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::Popup"), long(this) );
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::Popup"), long(this) );

     wxPopupTransientWindow::Popup(focus);
 }
 
 void SimpleTransientPopup::OnDismiss()
 {
     wxPopupTransientWindow::Popup(focus);
 }
 
 void SimpleTransientPopup::OnDismiss()
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnDismiss"), long(this) );
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnDismiss"), long(this) );

     wxPopupTransientWindow::OnDismiss();
 }
 
 bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event)
 {
     wxPopupTransientWindow::OnDismiss();
 }
 
 bool SimpleTransientPopup::ProcessLeftDown(wxMouseEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::ProcessLeftDown pos(%d, %d)"), long(this), event.GetX(), event.GetY());
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::ProcessLeftDown pos(%d, %d)"), long(this), event.GetX(), event.GetY());

     return wxPopupTransientWindow::ProcessLeftDown(event);
 }
 bool SimpleTransientPopup::Show( bool show )
 {
     return wxPopupTransientWindow::ProcessLeftDown(event);
 }
 bool SimpleTransientPopup::Show( bool show )
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::Show %d"), long(this), int(show));
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::Show %d"), long(this), int(show));

     return wxPopupTransientWindow::Show(show);
 }
 
 void SimpleTransientPopup::OnSize(wxSizeEvent &event)
 {
     return wxPopupTransientWindow::Show(show);
 }
 
 void SimpleTransientPopup::OnSize(wxSizeEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSize"), long(this) );
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSize"), long(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnSetFocus(wxFocusEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSetFocus"), long(this) );
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSetFocus"), long(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnKillFocus(wxFocusEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnKillFocus"), long(this) );
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnKillFocus"), long(this) );

     event.Skip();
 }
 
 void SimpleTransientPopup::OnMouse(wxMouseEvent &event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnMouse(wxMouseEvent &event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnMouse pos(%d, %d)"), long(this), event.GetX(), event.GetY());
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnMouse pos(%d, %d)"), long(this), event.GetX(), event.GetY());

     event.Skip();
 }
 
 void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 {
     event.Skip();
 }
 
 void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnButton ID %d"), long(this), event.GetId());
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnButton ID %d"), long(this), event.GetId());

 
     wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton);
     if (button->GetLabel() == wxT("Press Me"))
 
     wxButton *button = wxDynamicCast(event.GetEventObject(), wxButton);
     if (button->GetLabel() == wxT("Press Me"))


@@ -198,7 +198,7 @@ void SimpleTransientPopup::OnButton(wxCommandEvent& event)
 
 void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event)
 {
 
 void SimpleTransientPopup::OnSpinCtrl(wxSpinEvent& event)
 {

-    wxLogMessage( wxT("0x%x SimpleTransientPopup::OnSpinCtrl ID %d Value %d"), long(this), event.GetId(), event.GetInt());
+    wxLogMessage( wxT("0x%lx SimpleTransientPopup::OnSpinCtrl ID %d Value %ld"), long(this), event.GetId(), event.GetInt());

     event.Skip();
 }
 
     event.Skip();
 }
 


@@ -344,7 +344,7 @@ void MyFrame::OnStartSimplePopup(wxCommandEvent& event)
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );

-    wxLogMessage( wxT("0x%x Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );
+    wxLogMessage( wxT("0x%lx Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );

     popup->Popup();
 }
 
     popup->Popup();
 }
 


@@ -357,7 +357,7 @@ void MyFrame::OnStartScrolledPopup(wxCommandEvent& event)
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );

-    wxLogMessage( wxT("0x%x Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );
+    wxLogMessage( wxT("0x%lx Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );

     popup->Popup();
 }
 
     popup->Popup();
 }
 


@@ -409,7 +409,7 @@ void MyDialog::OnStartSimplePopup(wxCommandEvent& event)
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );

-    wxLogMessage( wxT("0x%x Dialog Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );
+    wxLogMessage( wxT("0x%lx Dialog Simple Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );

     popup->Popup();
 }
 
     popup->Popup();
 }
 


@@ -422,6 +422,6 @@ void MyDialog::OnStartScrolledPopup(wxCommandEvent& event)
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );
     wxPoint pos = btn->ClientToScreen( wxPoint(0,0) );
     wxSize sz = btn->GetSize();
     popup->Position( pos, sz );

-    wxLogMessage( wxT("0x%x Dialog Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );
+    wxLogMessage( wxT("0x%lx Dialog Scrolled Popup Shown pos(%d, %d) size(%d, %d)"), long(popup), pos.x, pos.y, sz.x, sz.y );

     popup->Popup();
 }
     popup->Popup();
 }