From: Robert Roebling Date: Sat, 22 Jan 2000 22:47:30 +0000 (+0000) Subject: Various makefile corrections, X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e680a378413d7624d148a641864efbbcf16b203f Various makefile corrections, Minor beatifications. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/Makefile.in b/Makefile.in index a5008654db..4a6ad0420b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # -# This file was automatically generated by tmake at 14:41, 2000/01/22 +# This file was automatically generated by tmake at 20:20, 2000/01/22 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T! # @@ -669,7 +669,9 @@ PM_HEADERS = \ UNIX_HEADERS = \ unix/execute.h \ - unix/fontutil.h + unix/fontutil.h \ + unix/gsockunx.h \ + unix/mimetype.h GENERIC_HEADERS = \ generic/calctrl.h \ @@ -860,7 +862,7 @@ GTK_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -958,7 +960,7 @@ GTK_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -1258,7 +1260,7 @@ MOTIF_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -1356,7 +1358,7 @@ MOTIF_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -1612,7 +1614,7 @@ MSW_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -1711,7 +1713,7 @@ MSW_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -2066,7 +2068,7 @@ PM_COMMONOBJS = \ longlong.o \ memory.o \ menucmn.o \ - mimetype.o \ + mimecmn.o \ module.o \ mstream.o \ object.o \ @@ -2165,7 +2167,7 @@ PM_COMMONDEPS = \ longlong.d \ memory.d \ menucmn.d \ - mimetype.d \ + mimecmn.d \ module.d \ mstream.d \ object.d \ @@ -2378,7 +2380,7 @@ BASE_OBJS = \ list.o \ log.o \ longlong.o \ - mimetype.o \ + mimecmn.o \ module.o \ object.o \ process.o \ @@ -2394,6 +2396,7 @@ BASE_OBJS = \ wfstream.o \ wxchar.o \ dir.o \ + mimetype.o \ threadpsx.o \ utilsunx.o @@ -2417,7 +2420,7 @@ BASE_DEPS = \ list.d \ log.d \ longlong.d \ - mimetype.d \ + mimecmn.d \ module.d \ object.d \ process.d \ @@ -2433,6 +2436,7 @@ BASE_DEPS = \ wfstream.d \ wxchar.d \ dir.d \ + mimetype.d \ threadpsx.d \ utilsunx.d @@ -2486,6 +2490,7 @@ UNIX_OBJS = \ fontenum.o \ fontutil.o \ gsocket.o \ + mimetype.o \ threadpsx.o \ utilsunx.o @@ -2495,6 +2500,7 @@ UNIX_DEPS = \ fontenum.d \ fontutil.d \ gsocket.d \ + mimetype.d \ threadpsx.d \ utilsunx.d diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 4534fa3dca..5bbfe4df5c 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -157,7 +157,7 @@ log.cpp C B longlong.cpp C B memory.cpp C menucmn.cpp C -mimetype.cpp C 32,B +mimecmn.cpp C 32,B module.cpp C B mstream.cpp C object.cpp C B @@ -307,6 +307,7 @@ fontutil.cpp U threadpsx.cpp U B utilsunx.cpp U B gsocket.c U +mimetype.cpp U B gsockgtk.c R win_gtk.c R @@ -1026,6 +1027,8 @@ statbox.h 2 fontutil.h S execute.h S +mimetype.h S +gsockunx.h S file.h P ftp.h P diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp index 039e140226..c5d5cd7580 100644 --- a/samples/checklst/checklst.cpp +++ b/samples/checklst/checklst.cpp @@ -204,24 +204,24 @@ void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Demo of wxCheckListBox control\n" + wxMessageBox(wxT("Demo of wxCheckListBox control\n" "© Vadim Zeitlin 1998-1999"), - _T("About wxCheckListBox"), + wxT("About wxCheckListBox"), wxICON_INFORMATION, this); } void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event) { int nSel = event.GetSelection(); - wxLogStatus(this, _T("item %d selected (%schecked)"), nSel, - m_pListBox->IsChecked(nSel) ? _T("") : _T("not ")); + wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel, + m_pListBox->IsChecked(nSel) ? _T("") : wxT("not ")); } void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event)) { wxString strSelection; - strSelection.sprintf(_T("item %d double clicked"), m_pListBox->GetSelection()); - wxMessageDialog dialog(this, strSelection); + strSelection.sprintf(wxT("Item %d double clicked"), m_pListBox->GetSelection()); + wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION); dialog.ShowModal(); } @@ -229,8 +229,8 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event) { unsigned int nItem = event.GetInt(); - wxLogStatus(this, _T("item %d was %schecked"), nItem, - m_pListBox->IsChecked(nItem) ? _T("") : _T("un")); + wxLogStatus(this, wxT("item %d was %schecked"), nItem, + m_pListBox->IsChecked(nItem) ? wxT("") : wxT("un")); } void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event)) @@ -253,7 +253,7 @@ void CheckListBoxFrame::OnButtonMove(bool up) int positionNew = up ? selection - 1 : selection + 2; if ( positionNew < 0 || positionNew > m_pListBox->GetCount() ) { - wxLogStatus(this, _T("Can't move this item %s"), up ? _T("up") : _T("down")); + wxLogStatus(this, wxT("Can't move this item %s"), up ? wxT("up") : wxT("down")); } else { @@ -274,12 +274,12 @@ void CheckListBoxFrame::OnButtonMove(bool up) AdjustColour(selection); AdjustColour(selectionNew); - wxLogStatus(this, _T("Item moved %s"), up ? _T("up") : _T("down")); + wxLogStatus(this, wxT("Item moved %s"), up ? wxT("up") : wxT("down")); } } else { - wxLogStatus(this, _T("Please select an item")); + wxLogStatus(this, wxT("Please select an item")); } } diff --git a/samples/dialup/Makefile.in b/samples/dialup/Makefile.in index f003eecdfb..6611eb8911 100644 --- a/samples/dialup/Makefile.in +++ b/samples/dialup/Makefile.in @@ -11,7 +11,7 @@ top_srcdir = @top_srcdir@ top_builddir = ../.. -program_dir = samples/nettest +program_dir = samples/dialup PROGRAM=nettest diff --git a/samples/dnd/dnd.cpp b/samples/dnd/dnd.cpp index 39b58f179e..6ba0420bb3 100644 --- a/samples/dnd/dnd.cpp +++ b/samples/dnd/dnd.cpp @@ -1772,7 +1772,7 @@ static void ShowBitmap(const wxBitmap& bitmap) frame->SetStatusText(wxString::Format(_T("%dx%d"), w, h)); frame->SetClientSize(w > 100 ? 100 : w, h > 100 ? 100 : h); - frame->Show(); + frame->Show(TRUE); } #ifdef USE_METAFILES diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp index 884e6e147e..add313c026 100644 --- a/samples/exec/exec.cpp +++ b/samples/exec/exec.cpp @@ -190,7 +190,9 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #endif // set the frame icon +#ifndef __WXGTK__ SetIcon(wxICON(mondrian)); +#endif // create a menu bar wxMenu *menuFile = new wxMenu(_T(""), wxMENU_TEAROFF); @@ -223,7 +225,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) - CreateStatusBar(2); + CreateStatusBar(); SetStatusText(_T("Welcome to wxWindows!")); #endif // wxUSE_STATUSBAR } diff --git a/samples/font/font.cpp b/samples/font/font.cpp index 0ed46b1aa5..a872b85b8a 100644 --- a/samples/font/font.cpp +++ b/samples/font/font.cpp @@ -235,34 +235,36 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) SetStatusText("Welcome to wxWindows font demo!"); } +// -------------------------------------------------------- -// event handlers -void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event)) +class MyEncodingEnumerator : public wxFontEnumerator { - class MyEncodingEnumerator : public wxFontEnumerator - { - public: - MyEncodingEnumerator() { m_n = 0; } - - const wxString& GetText() const { return m_text; } +public: + MyEncodingEnumerator() + { m_n = 0; } - protected: - virtual bool OnFontEncoding(const wxString& facename, - const wxString& encoding) - { - wxString text; - text.Printf("Encoding %d: %s (available in facename '%s')\n", - ++m_n, encoding.c_str(), facename.c_str()); - m_text += text; + const wxString& GetText() const + { return m_text; } - return TRUE; - } +protected: + virtual bool OnFontEncoding(const wxString& facename, + const wxString& encoding) + { + wxString text; + text.Printf("Encoding %d: %s (available in facename '%s')\n", + ++m_n, encoding.c_str(), facename.c_str()); + m_text += text; + return TRUE; + } - private: - size_t m_n; +private: + size_t m_n; + wxString m_text; +}; - wxString m_text; - } fontEnumerator; +void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event)) +{ + MyEncodingEnumerator fontEnumerator; fontEnumerator.EnumerateEncodings(); @@ -270,28 +272,33 @@ void MyFrame::OnEnumerateEncodings(wxCommandEvent& WXUNUSED(event)) fontEnumerator.GetText().c_str()); } -bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, - wxFontEncoding encoding, - bool silent) -{ - class MyFontEnumerator : public wxFontEnumerator - { - public: - bool GotAny() const { return !m_facenames.IsEmpty(); } +// ------------------------------------------------------------- - const wxArrayString& GetFacenames() const { return m_facenames; } +class MyFontEnumerator : public wxFontEnumerator +{ +public: + bool GotAny() const + { return !m_facenames.IsEmpty(); } - protected: - virtual bool OnFacename(const wxString& facename) - { - m_facenames.Add(facename); + const wxArrayString& GetFacenames() const + { return m_facenames; } - return TRUE; - } +protected: + virtual bool OnFacename(const wxString& facename) + { + m_facenames.Add(facename); + return TRUE; + } private: wxArrayString m_facenames; - } fontEnumerator; +} fontEnumerator; + +bool MyFrame::DoEnumerateFamilies(bool fixedWidthOnly, + wxFontEncoding encoding, + bool silent) +{ + MyFontEnumerator fontEnumerator; fontEnumerator.EnumerateFacenames(encoding, fixedWidthOnly);