X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2c5528a9e3b7ea0f5a40dfa21f60606e7e8b543..5f605ccf3fcce969d9a634bf1cf6aa4f13f74d2e:/samples/richedit/wxLayout.cpp

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index 017193f635..796dd2a310 100644
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -11,14 +11,20 @@
 #pragma implementation "wxLayout.h"
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 #ifdef __BORLANDC__
 #  pragma hdrstop
 #endif
 
 #include "wxLayout.h"
 #include <wx/textfile.h>
+#include <wx/image.h>
 
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif
 
 #include   "Micon.xpm"
 
@@ -39,7 +45,7 @@ enum ids
     ID_PRINT_SETUP, ID_PAGE_SETUP, ID_PREVIEW, ID_PRINT_PS,
     ID_PRINT_SETUP_PS, ID_PAGE_SETUP_PS,ID_PREVIEW_PS,
     ID_WRAP, ID_NOWRAP, ID_PASTE, ID_COPY, ID_CUT,
-    ID_PASTE_PRIMARY,
+    ID_COPY_PRIMARY, ID_PASTE_PRIMARY,
     ID_FIND,
     ID_WXLAYOUT_DEBUG, ID_QUIT, ID_CLICK, ID_HTML, ID_TEXT,
     ID_TEST, ID_LINEBREAKS_TEST, ID_LONG_TEST, ID_URL_TEST
@@ -104,10 +110,11 @@ MyFrame::MyFrame(void) :
    edit_menu->AppendSeparator();
    edit_menu->Append(ID_COPY, "&Copy", "Copy text to clipboard.");
    edit_menu->Append(ID_CUT, "Cu&t", "Cut text to clipboard.");
-#ifdef __WXGTK__
    edit_menu->Append(ID_PASTE,"&Paste", "Paste text from clipboard.");
-#endif
+#ifdef __WXGTK__
+   edit_menu->Append(ID_COPY_PRIMARY, "C&opy primary", "Copy text to primary selecton.");
    edit_menu->Append(ID_PASTE_PRIMARY,"&Paste primary", "Paste text from primary selection.");
+#endif
    edit_menu->Append(ID_FIND, "&Find", "Find text.");
    menu_bar->Append(edit_menu, "&Edit" );
 
@@ -123,6 +130,12 @@ MyFrame::MyFrame(void) :
    m_lwin->SetEditable(true);
    m_lwin->SetWrapMargin(40);
    m_lwin->SetFocus();
+
+   // JACS: under MSW, the window doesn't show the caret initially,
+   // and the following line I added doesn't help either.
+   // going to another window and then back again fixes it.
+   // m_lwin->OnSetFocus(wxFocusEvent());
+
    Clear();
 
 #if 0
@@ -162,7 +175,11 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();
    llist->Insert("Hello ");
+#if wxICON_IS_BITMAP
    llist->Insert(new wxLayoutObjectIcon(new wxICON(Micon)));
+#else
+   llist->Insert(new wxLayoutObjectIcon(new wxBitmap (wxICON(Micon))));
+#endif
    llist->SetFontWeight(wxBOLD);
    llist->Insert("World! ");
    llist->SetFontWeight(wxNORMAL);
@@ -238,7 +255,7 @@ MyFrame::AddSampleText(wxLayoutList *llist)
 void
 MyFrame::Clear(void)
 {
-   wxColour colBg(0, 255, 255);
+   wxColour colBg(0, 0, 0);
 
    m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxRED, &colBg);
 }
@@ -246,119 +263,145 @@ MyFrame::Clear(void)
 
 void MyFrame::OnCommand( wxCommandEvent &event )
 {
-   switch (event.GetId())
-   {
-   case ID_QUIT:
-      Close( TRUE );
-      break;
-   case ID_PRINT:
-   {
-      wxPrinter printer;
-      wxLayoutPrintout printout(m_lwin->GetLayoutList(),_("M: Printout"));
-      if (! printer.Print(this, &printout, TRUE))
-         wxMessageBox(
-            _("There was a problem with printing the message:\n"
-              "perhaps your current printer is not set up correctly?"),
-            _("Printing"), wxOK);
-   }
-   break;
-   case ID_NOWRAP:
-   case ID_WRAP:
-      m_lwin->SetWrapMargin(event.GetId() == ID_NOWRAP ? 0 : 40);
-      break;
-   case ID_ADD_SAMPLE:
-      AddSampleText(m_lwin->GetLayoutList());
-      break;
-   case ID_CLEAR:
-      Clear();
-      break;
+    switch (event.GetId())
+    {
+    case ID_QUIT:
+        Close( TRUE );
+        break;
+    case ID_PRINT:
+    {
+        wxPrinter printer;
+        wxLayoutPrintout printout(m_lwin->GetLayoutList(),_("M: Printout"));
+        if (! printer.Print(this, &printout, TRUE))
+        {
+            // Had to remove the split up strings that used to be below, and
+            // put them into one long strong. Otherwise MSVC would give an
+            // error "C2308: concatenating mismatched wide strings" when
+            // building a Unicode version.
+            wxMessageBox
+            (
+                _("There was a problem with printing the message:\nperhaps your current printer is not set up correctly?"),
+                _("Printing"), wxOK
+            );
+        }
+        break;
+    }
+
+    case ID_NOWRAP:
+    case ID_WRAP:
+        m_lwin->SetWrapMargin(event.GetId() == ID_NOWRAP ? 0 : 40);
+        break;
+    case ID_ADD_SAMPLE:
+        AddSampleText(m_lwin->GetLayoutList());
+        break;
+    case ID_CLEAR:
+        Clear();
+        break;
    case ID_CLICK:
-      cerr << "Received click event." << endl;
-      break;
+        cerr << "Received click event." << endl;
+        break;
    case ID_PASTE:
-      m_lwin->Paste();
-      m_lwin->Refresh(FALSE);
-      break;
+        m_lwin->Paste(TRUE);
+        m_lwin->Refresh(FALSE);
+        break;
 #ifdef __WXGTK__
-   case ID_PASTE_PRIMARY:
-      m_lwin->Paste(TRUE);
-      m_lwin->Refresh(FALSE);
-      break;
+    case ID_PASTE_PRIMARY:
+        // text only from primary:
+        m_lwin->Paste(FALSE, TRUE);
+        m_lwin->Refresh(FALSE);
+        break;
+    case ID_COPY_PRIMARY:
+        // copy text-only to primary selection:
+        m_lwin->Copy(FALSE,FALSE,TRUE);
+        m_lwin->Refresh(FALSE);
+        break;
 #endif
-   case ID_COPY:
-      m_lwin->Copy();
-      m_lwin->Refresh(FALSE);
-      break;
-   case ID_CUT:
-      m_lwin->Cut();
-      m_lwin->Refresh(FALSE);
-      break;
-   case ID_FIND:
-      m_lwin->Find("void");
-      m_lwin->Refresh(FALSE);
-      break;
-   case ID_HTML:
-   {
-      wxLayoutExportObject *export;
-      wxLayoutExportStatus status(m_lwin->GetLayoutList());
-
-      while((export = wxLayoutExport( &status,
-                                      WXLO_EXPORT_AS_HTML)) != NULL)
-      {
-         if(export->type == WXLO_EXPORT_HTML)
-            cout << *(export->content.text);
-         else
-            cout << "<!--UNKNOWN OBJECT>";
-         delete export;
-      }
-   }
-   break;
-   case ID_TEXT:
-   {
-      wxLayoutExportObject *export;
-      wxLayoutExportStatus status(m_lwin->GetLayoutList());
-
-      while((export = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
-      {
-         if(export->type == WXLO_EXPORT_TEXT)
-            cout << *(export->content.text);
-         else
-            cout << "<!--UNKNOWN OBJECT>";
-         delete export;
-      }
-   }
-   break;
-   case ID_LONG_TEST:
-   {
-      wxString line;
-      wxLayoutList *llist = m_lwin->GetLayoutList();
-      for(int i = 1; i < 300; i++)
-      {
-         line.Printf("This is line number %d.", i);
-         llist->Insert(line);
-         llist->LineBreak();
-      }
-      llist->MoveCursorTo(wxPoint(0,0));
-      m_lwin->SetDirty();
-      m_lwin->Refresh();
-      break;
-   }
-
-   case ID_LINEBREAKS_TEST:
-      wxLayoutImportText(m_lwin->GetLayoutList(),
-                         "This is a text\n"
-                         "with embedded line\n"
-                         "breaks.\n");
-      m_lwin->SetDirty();
-      m_lwin->Refresh();
-      break;
-
-   case ID_URL_TEST:
-      // VZ: this doesn't work, of course, but I think it should -
-      //     wxLayoutWindow should have a flag m_highlightUrls and do it itself
-      //     (instead of doing it manually like M does now)
-      m_lwin->GetLayoutList()->Insert("http://www.wxwindows.org/");
-   }
+    case ID_COPY:
+        m_lwin->Copy(TRUE,TRUE,FALSE);
+        m_lwin->Refresh(FALSE);
+        break;
+    case ID_CUT:
+        m_lwin->Cut();
+        m_lwin->Refresh(FALSE);
+        break;
+#ifdef M_BASEDIR
+    case ID_FIND:
+        m_lwin->Find("void");
+        m_lwin->Refresh(FALSE);
+        break;
+#endif
+    case ID_HTML:
+    {
+        wxLayoutExportObject *export0;
+        wxLayoutExportStatus status(m_lwin->GetLayoutList());
+
+        cout << "<HTML>" << endl;
+        while((export0 = wxLayoutExport( &status,
+                                         WXLO_EXPORT_AS_HTML)) != NULL)
+        {
+            if(export0->type == WXLO_EXPORT_HTML)
+                cout << *(export0->content.text);
+            else
+                ; // ignore itcout << "<!--UNKNOWN OBJECT>";
+
+            delete export0;
+        }
+        break;
+    }
+
+    case ID_TEXT:
+    {
+        wxLayoutExportObject *export0;
+        wxLayoutExportStatus status(m_lwin->GetLayoutList());
+
+        while((export0 = wxLayoutExport( &status, WXLO_EXPORT_AS_TEXT)) != NULL)
+        {
+            if(export0->type == WXLO_EXPORT_TEXT)
+                cout << *(export0->content.text);
+            else
+                cout << "<!--UNKNOWN OBJECT>";
+
+            delete export0;
+        }
+
+        break;
+    }
+
+
+    case ID_LONG_TEST:
+    {
+        wxString line;
+        wxLayoutList *llist = m_lwin->GetLayoutList();
+        for(int i = 1; i < 300; i++)
+        {
+            line.Printf(wxT("This is line number %d."), i);
+            llist->Insert(line);
+            llist->LineBreak();
+        }
+
+        llist->MoveCursorTo(wxPoint(0,0));
+        m_lwin->SetDirty();
+        m_lwin->Refresh();
+        break;
+    }
+
+    case ID_LINEBREAKS_TEST:
+        wxLayoutImportText
+        (
+            m_lwin->GetLayoutList(),
+            wxT("This is a text\nwith embedded line\nbreaks.\n")
+        );
+
+        m_lwin->SetDirty();
+        m_lwin->Refresh();
+        break;
+
+    case ID_URL_TEST:
+        // VZ: this doesn't work, of course, but I think it should -
+        //     wxLayoutWindow should have a flag m_highlightUrls and do it itself
+        //     (instead of doing it manually like M does now)
+        m_lwin->GetLayoutList()->Insert("http://www.wxwindows.org/");
+    }
 };
 
 void MyFrame::OnPrint(wxCommandEvent& WXUNUSED(event))
@@ -447,7 +490,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& WXUNUSED(event))
 #endif
    wxPageSetupData data;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
@@ -463,7 +506,7 @@ void MyFrame::OnPrintSetupPS(wxCommandEvent& WXUNUSED(event))
 
    wxPrintData data;
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPrintDialog printerDialog(this, & data);
 #else
    wxGenericPrintDialog printerDialog(this, & data);
@@ -476,7 +519,7 @@ void MyFrame::OnPageSetupPS(wxCommandEvent& WXUNUSED(event))
    wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
 
    wxPageSetupData data;
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
    wxPageSetupDialog pageSetupDialog(this, & data);
 #else
    wxGenericPageSetupDialog pageSetupDialog(this, & data);
@@ -497,6 +540,7 @@ MyApp::MyApp(void) :
 bool MyApp::OnInit(void)
 {
    wxFrame *frame = new MyFrame();
+   wxInitAllImageHandlers();
    frame->Show( TRUE );
 //   wxSetAFMPath("/usr/local/src/wxWindows/misc/afm/");
    return TRUE;