Ticket #41218: fityk.diff

File fityk.diff, 2.6 KB (added by uvw2@…, 11 years ago)
  • Portfile

    diff -urN fityk.old/Portfile fityk/Portfile
    old new  
    1010# other than that there is no reason not to use 1.2.1,
    1111# but maybe a special addition to version string is needed to make the version info more exact
    1212# github.setup        wojdyr fityk 1.2.1 v
    13 github.setup        wojdyr fityk d401afd128
     13github.setup        wojdyr fityk 658ec7e1b3
    1414name                fityk
    1515version             1.2.1
    1616revision            2
     
    2828
    2929homepage            http://fityk.nieto.pl/
    3030
    31 checksums           rmd160  df90f35efd878c9b21659715159c40c4f21a39b2 \
    32                     sha256  18cca305a151ef54051968bc055f2f36cd3588d67f9a8d19db538ee857d7617c
     31checksums           rmd160  b0c893352f2fb4026308786648270e4d4acaff46 \
     32                    sha256  a4ae63f8befb22ef60b7823406221c73b7b362027e07e9070a56db1db88bef98
    3333
    3434# TODO: also apply http://wiki.wxwidgets.org/WxMac-specific_topics#My_app_can.27t_be_brought_to_the_front.21
    3535app.name            fityk
     
    5252
    5353depends_run         port:gnuplot
    5454
     55patchfiles      patch-frame.cpp.diff
     56
    5557use_autoreconf      yes
    5658
    5759configure.args-append --with-wxdir=${wxWidgets.wxdir}
  • files/patch-frame.cpp.diff

    diff -urN fityk.old/files/patch-frame.cpp.diff fityk/files/patch-frame.cpp.diff
    old new  
     1diff -ur wxgui/frame.cpp wxgui/frame.cpp
     2--- wxgui/frame.cpp     2013-11-20 08:09:33.000000000 +0900
     3+++ wxgui/frame.cpp     2013-11-21 08:53:49.000000000 +0900
     4@@ -451,6 +451,7 @@
     5     toolbar_ = new FToolBar(this, -1);
     6     toolbar_->update_peak_type(peak_type_nr_, &peak_types_);
     7     SetToolBar(toolbar_);
     8+    toolbar_->Realize();
     9 
     10     //status bar
     11     status_bar_ = new FStatusBar(this);
     12@@ -1658,11 +1659,13 @@
     13     if (show && !GetToolBar()) {
     14         toolbar_ = new FToolBar(this, -1);
     15         SetToolBar(toolbar_);
     16+        toolbar_->Realize();
     17         update_toolbar();
     18         update_peak_type_list();
     19         //toolbar_->ToggleTool(ID_T_BAR, v_splitter_->IsSplit());
     20     } else if (!show && GetToolBar()){
     21         SetToolBar(NULL);
     22+        toolbar_->Realize();
     23         delete toolbar_;
     24         toolbar_ = NULL;
     25     }
     26@@ -2384,7 +2387,6 @@
     27     //AddTool(ID_T_BAR, wxT("SideBar"),
     28     //        wxBitmap(right_pane_xpm), wxNullBitmap, wxITEM_CHECK,
     29     //        wxT("Datasets Pane"), wxT("Show/hide datasets pane"));
     30-    Realize();
     31 }
     32 
     33 void FToolBar::OnPeakChoice(wxCommandEvent &event)