only check for lib directory for architectures which have multiple ABIs (Solaris...

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

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 0744d063d4ca3cdbb7acbff63c184c628a15365e..2a0b0bc08274a8d1d5a7e4dc27433c33b7a3bd12 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        display.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        display.cpp

-// Purpose:     wxWindows sample showing the features of wxDisplay class
+// Purpose:     wxWidgets sample showing the features of wxDisplay class

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Ryan Norton & Brian Victor

 // Created:     23.02.03
 // RCS-ID:      $Id$
 // Created:     23.02.03
 // RCS-ID:      $Id$

-// Copyright:   (c) Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// for compilers that support precompilation, includes "wx/wx.h".from here
+// for compilers that support precompilation, includes "wx/wx.h"

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -26,18 +26,23 @@
 
 // for all others, include the necessary headers explicitly
 #ifndef WX_PRECOMP
 
 // for all others, include the necessary headers explicitly
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
-    #include "wx/frame.h"
-
-    #include "wx/stattext.h"
+    #include "wx/wx.h"
+#endif

 
 

-    #include "wx/layout.h"
+#if !wxUSE_DISPLAY
+    #error "To compile this sample you must build the library with wxUSE_DISPLAY set to 1"

 #endif
 
 #include "wx/notebook.h"
 
 #include "wx/display.h"
 
 #endif
 
 #include "wx/notebook.h"
 
 #include "wx/display.h"
 

+
+// the application icon (under Windows and OS/2 it is in resources)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -83,7 +88,7 @@ private:
     // GUI controls
     wxNotebook *m_notebook;
 
     // GUI controls
     wxNotebook *m_notebook;
 

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 


@@ -122,10 +127,10 @@ enum
 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)


@@ -143,7 +148,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged)
 END_EVENT_TABLE()
 
     EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -169,17 +174,17 @@ bool MyApp::OnInit()
 #endif // __WXMSW__
 
     // create the main application window
 #endif // __WXMSW__
 
     // create the main application window

-    MyFrame *frame = new MyFrame(_("Display wxWindows Sample"),
-                                 wxPoint(50, 50), wxSize(450, 340));
+    MyFrame *frame = new MyFrame(_("Display wxWidgets Sample"),
+                                 wxDefaultPosition, wxDefaultSize);

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show();
 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
     frame->Show();
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -188,10 +193,10 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)

-       : wxFrame(NULL, -1, title, pos, size, style)
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style)

 {
     // set the frame icon
 {
     // set the frame icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
 #if wxUSE_MENUS
     // create a menu bar
 
 #if wxUSE_MENUS
     // create a menu bar


@@ -215,44 +220,49 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 

+#if wxUSE_STATUSBAR

     // create status bar
     CreateStatusBar();
     // create status bar
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // create child controls
 
     // create child controls

-    m_notebook = new wxNotebook(this, -1);
+
+    wxPanel *panel = new wxPanel(this, wxID_ANY);
+
+    m_notebook = new wxNotebook(panel, wxID_ANY);

     const size_t count = wxDisplay::GetCount();
     for ( size_t nDpy = 0; nDpy < count; nDpy++ )
     {
         wxDisplay display(nDpy);
 
     const size_t count = wxDisplay::GetCount();
     for ( size_t nDpy = 0; nDpy < count; nDpy++ )
     {
         wxDisplay display(nDpy);
 

-        wxWindow *page = new wxPanel(m_notebook, -1);
+        wxWindow *page = new wxPanel(m_notebook, wxID_ANY);

 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);
         sizer->AddGrowableCol(1);
 
         const wxRect r(display.GetGeometry());
 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);
         sizer->AddGrowableCol(1);
 
         const wxRect r(display.GetGeometry());

-        sizer->Add(new wxStaticText(page, -1, _T("Origin: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Origin: ")));

         sizer->Add(new wxStaticText
                        (
                         page,
         sizer->Add(new wxStaticText
                        (
                         page,

-                        -1,
+                        wxID_ANY,

                         wxString::Format(_T("(%d, %d)"),
                                          r.x, r.y)
                        ));
 
                         wxString::Format(_T("(%d, %d)"),
                                          r.x, r.y)
                        ));
 

-        sizer->Add(new wxStaticText(page, -1, _T("Size: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Size: ")));

         sizer->Add(new wxStaticText
                        (
                         page,
         sizer->Add(new wxStaticText
                        (
                         page,

-                        -1,
+                        wxID_ANY,

                         wxString::Format(_T("(%d, %d)"),
                                          r.width, r.height)
                        ));
 
 
                         wxString::Format(_T("(%d, %d)"),
                                          r.width, r.height)
                        ));
 
 

-        sizer->Add(new wxStaticText(page, -1, _T("Name: ")));
-        sizer->Add(new wxStaticText(page, -1, display.GetName()));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Name: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, display.GetName()));

 
         wxChoice *choiceModes = new wxChoice(page, Display_ChangeMode);
         const wxArrayVideoModes modes = display.GetModes();
 
         wxChoice *choiceModes = new wxChoice(page, Display_ChangeMode);
         const wxArrayVideoModes modes = display.GetModes();


@@ -265,16 +275,17 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                                 new MyVideoModeClientData(mode));
         }
 
                                 new MyVideoModeClientData(mode));
         }
 

-        sizer->Add(new wxStaticText(page, -1, _T("&Modes: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("&Modes: ")));

         sizer->Add(choiceModes, 0, wxEXPAND);
 
         sizer->Add(choiceModes, 0, wxEXPAND);
 

-        sizer->Add(new wxStaticText(page, -1, _T("Current: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Current: ")));

         sizer->Add(new wxStaticText(page, Display_CurrentMode,
                                     VideoModeToText(display.GetCurrentMode())));
 
         // add it to another sizer to have borders around it and button below
         wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
         sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10);
         sizer->Add(new wxStaticText(page, Display_CurrentMode,
                                     VideoModeToText(display.GetCurrentMode())));
 
         // add it to another sizer to have borders around it and button below
         wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
         sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10);

+

         sizerTop->Add(new wxButton(page, Display_ResetMode, _T("&Reset mode")),
                       0, wxALL | wxCENTRE, 5);
         page->SetSizer(sizerTop);
         sizerTop->Add(new wxButton(page, Display_ResetMode, _T("&Reset mode")),
                       0, wxALL | wxCENTRE, 5);
         page->SetSizer(sizerTop);


@@ -283,6 +294,12 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                             wxString::Format(_T("Display %lu"),
                                              (unsigned long)nDpy));
     }
                             wxString::Format(_T("Display %lu"),
                                              (unsigned long)nDpy));
     }

+
+    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(m_notebook, 1, wxEXPAND);
+    panel->SetSizer(sizer);
+    sizer->Fit(this);
+    sizer->SetSizeHints(this);

 }
 
 wxString MyFrame::VideoModeToText(const wxVideoMode& mode)
 }
 
 wxString MyFrame::VideoModeToText(const wxVideoMode& mode)


@@ -307,8 +324,8 @@ wxString MyFrame::VideoModeToText(const wxVideoMode& mode)
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

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


@@ -321,7 +338,9 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Press the mouse anywhere..."));
     SetStatusText(_T("Press the mouse anywhere..."));

+#endif // wxUSE_STATUSBAR

 
     CaptureMouse();
 }
 
     CaptureMouse();
 }


@@ -373,7 +392,7 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
     // update the current mode text
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
     // update the current mode text

-    for ( int n = 0; n < m_notebook->GetPageCount(); n++ )
+    for ( size_t n = 0; n < m_notebook->GetPageCount(); n++ )

     {
         wxStaticText *label = wxDynamicCast(m_notebook->GetPage(n)->
                                                 FindWindow(Display_CurrentMode),
     {
         wxStaticText *label = wxDynamicCast(m_notebook->GetPage(n)->
                                                 FindWindow(Display_CurrentMode),