compate charset names case-insensitively in GetEncodingFromName()

[wxWidgets.git] / samples / png / pngdemo.cpp

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index 989b005dc1dd066f0f21446e71a3f7bb5ad7b430..ba275d9c090f03b162ec2c19fe8e572adb2ca3ef 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -29,10 +29,6 @@ wxBitmap  *g_TestBitmap = (wxBitmap *) NULL;
 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 

-MyApp::MyApp()
-{
-}
-

 bool MyApp::OnInit(void)
 {
   wxImage::AddHandler(new wxPNGHandler);
 bool MyApp::OnInit(void)
 {
   wxImage::AddHandler(new wxPNGHandler);


@@ -40,8 +36,10 @@ bool MyApp::OnInit(void)
   // Create the main frame window
   frame = new MyFrame((wxFrame *) NULL, _T("wxPNGBitmap Demo"), wxPoint(0, 0), wxSize(300, 300));
 
   // Create the main frame window
   frame = new MyFrame((wxFrame *) NULL, _T("wxPNGBitmap Demo"), wxPoint(0, 0), wxSize(300, 300));
 

+#if wxUSE_STATUSBAR

   // Give it a status line
   frame->CreateStatusBar(2);
   // Give it a status line
   frame->CreateStatusBar(2);

+#endif // wxUSE_STATUSBAR

 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;


@@ -66,11 +64,13 @@ bool MyApp::OnInit(void)
 //  canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
   frame->canvas = canvas;
 
 //  canvas->SetScrollbars(20, 20, 50, 50, 4, 4);
   frame->canvas = canvas;
 

-  frame->Show(TRUE);
+  frame->Show(true);

 
 

-  frame->SetStatusText(_T("Hello, wxWindows"));
+#if wxUSE_STATUSBAR
+  frame->SetStatusText(_T("Hello, wxWidgets"));
+#endif // wxUSE_STATUSBAR

 
 

-  return TRUE;
+  return true;

 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 }
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -82,7 +82,7 @@ END_EVENT_TABLE()
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):
 
 // Define my frame constructor
 MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size):

-  wxFrame(frame, -1, title, pos, size)
+  wxFrame(frame, wxID_ANY, title, pos, size)

 {
   canvas = (MyCanvas *) NULL;
 }
 {
   canvas = (MyCanvas *) NULL;
 }


@@ -99,7 +99,7 @@ MyFrame::~MyFrame()
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -110,40 +110,43 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnSaveFile(wxCommandEvent& WXUNUSED(event))
 {

-  wxString f = wxFileSelector( wxT("Save Image"), (const wxChar *)NULL,
-                               (const wxChar *)NULL,
-                               wxT("png"), wxT("PNG files (*.png)|*.png") );
-
-  if (f == _T(""))  return;
-  
-  wxBitmap *backstore = new wxBitmap( 150, 150 );
-  
-  wxMemoryDC memDC;
-  memDC.SelectObject( *backstore );
-  memDC.Clear();
-  memDC.SetBrush( *wxBLACK_BRUSH );
-  memDC.SetPen( *wxWHITE_PEN );
-  memDC.DrawRectangle( 0, 0, 150, 150 );
-  memDC.SetPen( *wxBLACK_PEN );
-  memDC.DrawLine( 0, 0, 0, 10 );
-  memDC.SetTextForeground( *wxWHITE );
-  memDC.DrawText( _T("This is a memory dc."), 10, 10 );
-  
-  memDC.SelectObject( wxNullBitmap );
-  
-  backstore->SaveFile( f, wxBITMAP_TYPE_PNG, (wxPalette*)NULL );
-  
-  delete backstore;
+#if wxUSE_FILEDLG
+    wxString f = wxFileSelector( wxT("Save Image"), (const wxChar *)NULL,
+                                 (const wxChar *)NULL,
+                                 wxT("png"), wxT("PNG files (*.png)|*.png") );
+
+    if (f.empty())  return;
+
+    wxBitmap *backstore = new wxBitmap( 150, 150 );
+
+    wxMemoryDC memDC;
+    memDC.SelectObject( *backstore );
+    memDC.Clear();
+    memDC.SetBrush( *wxBLACK_BRUSH );
+    memDC.SetPen( *wxWHITE_PEN );
+    memDC.DrawRectangle( 0, 0, 150, 150 );
+    memDC.SetPen( *wxBLACK_PEN );
+    memDC.DrawLine( 0, 0, 0, 10 );
+    memDC.SetTextForeground( *wxWHITE );
+    memDC.DrawText( _T("This is a memory dc."), 10, 10 );
+
+    memDC.SelectObject( wxNullBitmap );
+
+    backstore->SaveFile( f, wxBITMAP_TYPE_PNG, (wxPalette*)NULL );
+
+    delete backstore;
+#endif // wxUSE_FILEDLG

 }
 
 void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_FILEDLG

     // Show file selector.
     wxString f = wxFileSelector(wxT("Open Image"), (const wxChar *) NULL,
                                     (const wxChar *) NULL, wxT("png"),
                                     wxT("PNG files (*.png)|*.png"));
 
     // Show file selector.
     wxString f = wxFileSelector(wxT("Open Image"), (const wxChar *) NULL,
                                     (const wxChar *) NULL, wxT("png"),
                                     wxT("PNG files (*.png)|*.png"));
 

-    if (f == _T(""))
+    if (f.empty())

         return;
 
     if ( g_TestBitmap )
         return;
 
     if ( g_TestBitmap )


@@ -157,6 +160,7 @@ void MyFrame::OnLoadFile(wxCommandEvent& WXUNUSED(event))
     }
 
     canvas->Refresh();
     }
 
     canvas->Refresh();

+#endif // wxUSE_FILEDLG

 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 }
 
 BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)


@@ -165,52 +169,46 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size):

- wxScrolledWindow(parent, -1, pos, size)
-{
-}
-
-MyCanvas::~MyCanvas(void)
+ wxScrolledWindow(parent, wxID_ANY, pos, size)

 {
 }
 
 // Define the repainting behaviour
 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {
 {
 }
 
 // Define the repainting behaviour
 void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
 {

-  wxPaintDC dc(this);
-  dc.SetPen(* wxRED_PEN);
-
-  int i;
-  for ( i = 0; i < 500; i += 10)
-  {
-    dc.DrawLine(0, i, 800, i);
-  }
-  if ( g_TestBitmap && g_TestBitmap->Ok() )
-  {
-    wxMemoryDC memDC;
-    if ( g_TestBitmap->GetPalette() )
+    wxPaintDC dc(this);
+    dc.SetPen(* wxRED_PEN);
+
+    int i;
+    for ( i = 0; i < 500; i += 10)

     {
     {

-        memDC.SetPalette(* g_TestBitmap->GetPalette());
-        dc.SetPalette(* g_TestBitmap->GetPalette());
+        dc.DrawLine(0, i, 800, i);
+    }
+    if ( g_TestBitmap && g_TestBitmap->Ok() )
+    {
+        wxMemoryDC memDC;
+        if ( g_TestBitmap->GetPalette() )
+        {
+            memDC.SetPalette(* g_TestBitmap->GetPalette());
+            dc.SetPalette(* g_TestBitmap->GetPalette());
+        }
+        memDC.SelectObject(* g_TestBitmap);
+
+        // Normal, non-transparent blitting
+        dc.Blit(20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC, 0, 0, wxCOPY, false);
+
+        memDC.SelectObject(wxNullBitmap);

     }
     }

-    memDC.SelectObject(* g_TestBitmap);
-
-    // Normal, non-transparent blitting
-    dc.Blit(20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC, 0, 0, wxCOPY, FALSE);
-
-    memDC.SelectObject(wxNullBitmap);
-  }

 
 

-  if ( g_TestBitmap && g_TestBitmap->Ok() )
-  {
-    wxMemoryDC memDC;
-    memDC.SelectObject(* g_TestBitmap);
+    if ( g_TestBitmap && g_TestBitmap->Ok() )
+    {
+        wxMemoryDC memDC;
+        memDC.SelectObject(* g_TestBitmap);

 
 

-    // Transparent blitting if there's a mask in the bitmap
-    dc.Blit(20 + g_TestBitmap->GetWidth() + 20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC,
-      0, 0, wxCOPY, TRUE);
+        // Transparent blitting if there's a mask in the bitmap
+        dc.Blit(20 + g_TestBitmap->GetWidth() + 20, 20, g_TestBitmap->GetWidth(), g_TestBitmap->GetHeight(), & memDC,
+            0, 0, wxCOPY, true);

 
 

-    memDC.SelectObject(wxNullBitmap);
-  }
+        memDC.SelectObject(wxNullBitmap);
+    }

 }
 }

-
-