Piano win should not appear as desktop window under X. Fix CompassWin

rotated icon under GTK.
ktec · Jun 15, 2012 · 7b44408 · 7b44408
1 parent e286112
commit 7b44408
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/include/styles.h b/include/styles.h
@@ -41,6 +41,7 @@ enum StyleToolIconTypes
       TOOLICON_ACTIVE
 };
 
+void bmdump( wxBitmap bm, wxString name );
 wxBitmap MergeBitmaps( wxBitmap back, wxBitmap front, wxSize offset );
 wxBitmap ConvertTo24Bit( wxColor bgColor, wxBitmap front );
 

diff --git a/src/compasswin.cpp b/src/compasswin.cpp
@@ -170,13 +170,12 @@ wxBitmap ocpnFloatingCompassWindow::CreateBmp()
             if( g_bCourseUp ) BMPRose = style->GetIcon( _T("CompassRose") );
             else
                 BMPRose = style->GetIcon( _T("CompassRoseBlue") );
-
             if( ( fabs( cc1->GetVPRotation() ) > .01 ) || ( fabs( cc1->GetVPSkew() ) > .01 ) ) {
                 wxPoint rot_ctr( BMPRose.GetWidth() / 2, BMPRose.GetHeight() / 2 );
                 wxImage rose_img = BMPRose.ConvertToImage();
 
                 wxImage rot_image = rose_img.Rotate( rose_angle, rot_ctr, true, &after_rotate );
-                BMPRose = wxBitmap( rot_image );
+                BMPRose = wxBitmap( rot_image ).GetSubBitmap( wxRect(0, 0, BMPRose.GetWidth(), BMPRose.GetHeight()) );
             }
 
             wxBitmap iconBm;
@@ -186,6 +185,7 @@ wxBitmap ocpnFloatingCompassWindow::CreateBmp()
             } else {
                 iconBm = BMPRose;
             }
+
             mdc.DrawBitmap( iconBm, offset );
             offset.x += iconBm.GetWidth();
 

diff --git a/src/statwin.cpp b/src/statwin.cpp
@@ -56,7 +56,7 @@ END_EVENT_TABLE()
 // ctor
 StatWin::StatWin( wxWindow *frame ) :
         wxDialog( frame, wxID_ANY, _T(""), wxPoint( 20, 20 ), wxSize( 5, 5 ),
-                wxSIMPLE_BORDER | wxFRAME_SHAPED )
+                wxSIMPLE_BORDER | wxFRAME_SHAPED | wxFRAME_NO_TASKBAR )
 
 {
     int x, y;