Added support for transparency in rotation code

[wxWidgets.git] / demos / dbbrowse / doc.cpp

diff --git a/demos/dbbrowse/doc.cpp b/demos/dbbrowse/doc.cpp
index 1a34801643ee2c327097a69a7f2170558e17ca3b..64305d1f0874f4463628ae112d0db2a45923b0a4 100644 (file)
--- a/demos/dbbrowse/doc.cpp
+++ b/demos/dbbrowse/doc.cpp
@@ -7,6 +7,7 @@
 // Created:     19990808
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license
 // Created:     19990808
 // Copyright:   (c) Mark Johnson
 // Licence:     wxWindows license

+// RCS-ID:      $Id$

 //---------------------------------------------------------------------------
 //-- all #ifdefs that the whole Project needs. ------------------------------
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 //-- all #ifdefs that the whole Project needs. ------------------------------
 //---------------------------------------------------------------------------


@@ -79,8 +80,10 @@ mjDoc::~mjDoc()
 bool mjDoc::OnNewDocument()
 {
   //-------------------------------------------------------------------
 bool mjDoc::OnNewDocument()
 {
   //-------------------------------------------------------------------

-  if (!OnInitView())                 // LogBook is now activ
+  if (!OnInitView())
+    {

     return FALSE;
     return FALSE;

+    }

   p_PgmCtrl->OnPopulate();
   //-------------------------------------------------------------------
   return TRUE;
   p_PgmCtrl->OnPopulate();
   //-------------------------------------------------------------------
   return TRUE;


@@ -112,7 +115,8 @@ bool mjDoc::OnInitView()
   //--------------------------------------------------------------------------
   p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
                            wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );
   //--------------------------------------------------------------------------
   p_LogWin = new wxTextCtrl(p_PageArea,-1,wxEmptyString,
                            wxDefaultPosition, wxDefaultSize,wxTE_MULTILINE );

-  wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
+  //wxFont* ft_Temp = new wxFont(10,wxSWISS,wxNORMAL,wxBOLD,FALSE,"Comic Sans MS");
+  wxFont* ft_Temp = new wxFont(wxSystemSettings::GetSystemFont(wxSYS_SYSTEM_FONT));

   p_LogWin->SetFont(* ft_Temp);
   // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
   //------------------------------------------------------------------
   p_LogWin->SetFont(* ft_Temp);
   // Don't forget ! This is always : i_TabArt = 0 ; i_ViewNr = 1;
   //------------------------------------------------------------------


@@ -187,7 +191,7 @@ bool mjDoc::OnInitODBC()
       (p_DSN+i)->Drv = s_SortDsDesc[i];
       (p_DSN+i)->Usr = "";
       (p_DSN+i)->Pas = "";
       (p_DSN+i)->Drv = s_SortDsDesc[i];
       (p_DSN+i)->Usr = "";
       (p_DSN+i)->Pas = "";

-      Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn,(p_DSN+i)->Drv);
+      Temp0.Printf("%02d) Dsn(%s) DsDesc(%s)",i,(p_DSN+i)->Dsn.c_str(),(p_DSN+i)->Drv.c_str());

       wxLogMessage(Temp0);
     }
   i = 0;
       wxLogMessage(Temp0);
     }
   i = 0;