The UseAntiAliasing is off by default on wxMac. Add a menu item to

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

diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 5d36625f14d2048b5b35f96bed8e126f456099fa..2441a6090455f2228a76d80142c5763a25fbb535 100644 (file)
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma implementation
 #pragma interface
 #endif
 #pragma implementation
 #pragma interface
 #endif


@@ -25,6 +25,10 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

+#ifdef __WXWINCE__
+#include "wx/msw/wince/time.h"
+#endif
+

 #include "wx/colordlg.h"
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"
 #include "wx/colordlg.h"
 #include "wx/filedlg.h"
 #include "wx/dirdlg.h"


@@ -34,6 +38,7 @@
 #include "wx/progdlg.h"
 #include "wx/fdrepdlg.h"
 #include "wx/busyinfo.h"
 #include "wx/progdlg.h"
 #include "wx/fdrepdlg.h"
 #include "wx/busyinfo.h"

+#include "wx/image.h"

 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 
 
 #define wxTEST_GENERIC_DIALOGS_IN_MSW 0
 


@@ -44,7 +49,7 @@
 
 #define wxUSE_DIRDLGG 0
 
 
 #define wxUSE_DIRDLGG 0
 

-#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
+#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG

 #include "wx/generic/dirdlgg.h"
 #endif
 
 #include "wx/generic/dirdlgg.h"
 #endif
 


@@ -119,6 +124,10 @@ MyCanvas *myCanvas = (MyCanvas *) NULL;
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {
 // `Main program' equivalent, creating windows and returning main app frame
 bool MyApp::OnInit()
 {

+#if wxUSE_IMAGE
+    wxInitAllImageHandlers();
+#endif
+

 #if defined(__WXGTK__) && defined(wxUSE_UNICODE)
   wxConvCurrent = &wxConvLibc;
 #endif
 #if defined(__WXGTK__) && defined(wxUSE_UNICODE)
   wxConvCurrent = &wxConvLibc;
 #endif


@@ -131,7 +140,7 @@ bool MyApp::OnInit()
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;

-
+  

   file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW
   file_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour"));
 
 #if defined(__WXMSW__) && wxTEST_GENERIC_DIALOGS_IN_MSW


@@ -238,7 +247,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
         wxColourData retData = dialog.GetColourData();
         col = retData.GetColour();
         myCanvas->SetBackgroundColour(col);
         wxColourData retData = dialog.GetColourData();
         col = retData.GetColour();
         myCanvas->SetBackgroundColour(col);

-        myCanvas->Clear();
+        myCanvas->ClearBackground();

         myCanvas->Refresh();
     }
 }
         myCanvas->Refresh();
     }
 }


@@ -284,7 +293,7 @@ void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event))
         wxColour col = retData.GetColour();
 //        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);
         myCanvas->SetBackgroundColour(col);
         wxColour col = retData.GetColour();
 //        wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID);
         myCanvas->SetBackgroundColour(col);

-        myCanvas->Clear();
+        myCanvas->ClearBackground();

         myCanvas->Refresh();
       }
       dialog->Destroy();
         myCanvas->Refresh();
       }
       dialog->Destroy();


@@ -308,7 +317,7 @@ void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) )
 }
 #endif // wxTEST_GENERIC_DIALOGS_IN_MSW
 
 }
 #endif // wxTEST_GENERIC_DIALOGS_IN_MSW
 

-void MyFrame::LogDialog(wxCommandEvent& event)
+void MyFrame::LogDialog(wxCommandEvent& WXUNUSED(event))

 {
     // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
     // being flushed -- test it
 {
     // calling wxYield() (as ~wxBusyCursor does) shouldn't result in messages
     // being flushed -- test it


@@ -514,8 +523,14 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 {

+    wxString wildcards = 
+#ifdef __WXMOTIF__
+                    _T("C++ files (*.cpp)|*.cpp");
+#else
+                    _T("All files (*.*)|*.*|C++ files (*.h;*.cpp)|*.h;*.cpp");
+#endif

     wxFileDialog dialog(this, _T("Testing open multiple file dialog"),
     wxFileDialog dialog(this, _T("Testing open multiple file dialog"),

-                        _T(""), _T(""), wxFileSelectorDefaultWildcardStr,
+                        _T(""), _T(""), wildcards,

                         wxMULTIPLE);
 
     if (dialog.ShowModal() == wxID_OK)
                         wxMULTIPLE);
 
     if (dialog.ShowModal() == wxID_OK)


@@ -534,6 +549,8 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) )
 
             msg += s;
         }
 
             msg += s;
         }

+        s.Printf(_T("Filter index: %d"), dialog.GetFilterIndex());
+        msg += s;

 
         wxMessageDialog dialog2(this, msg, _T("Selected files"));
         dialog2.ShowModal();
 
         wxMessageDialog dialog2(this, msg, _T("Selected files"));
         dialog2.ShowModal();


@@ -586,7 +603,7 @@ void MyFrame::DirChooseNew(wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::GenericDirChoose(wxCommandEvent& WXUNUSED(event) )
 {

-#if !defined(__WXMSW__) || defined(wxUSE_DIRDLGG) && wxUSE_DIRDLGG
+#if !(defined(__WXMSW__) || defined(__WXMAC__)) || wxUSE_DIRDLGG

     // pass some initial dir to wxDirDialog
     wxString dirHome;
     wxGetHomeDir(&dirHome);
     // pass some initial dir to wxDirDialog
     wxString dirHome;
     wxGetHomeDir(&dirHome);


@@ -631,7 +648,7 @@ void MyFrame::ModelessDlg(wxCommandEvent& event)
     }
 }
 
     }
 }
 

-void MyFrame::ShowTip(wxCommandEvent& event)
+void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event))

 {
 #if wxUSE_STARTUP_TIPS
     static size_t s_index = (size_t)-1;
 {
 #if wxUSE_STARTUP_TIPS
     static size_t s_index = (size_t)-1;