diff --git a/src/servers/print/PrintServerApp.cpp b/src/servers/print/PrintServerApp.cpp index a1354cdf37..f591781804 100644 --- a/src/servers/print/PrintServerApp.cpp +++ b/src/servers/print/PrintServerApp.cpp @@ -111,16 +111,8 @@ PrintServerApp::PrintServerApp(status_t* err) RetrieveDefaultPrinter(); // Cache icons for selected printer -#ifdef HAIKU_TARGET_PLATFORM_HAIKU BMimeType type(PSRV_PRINTER_FILETYPE); type.GetIcon(&fSelectedIcon, &fIconSize); -#else - fSelectedIconMini = new BBitmap(BRect(0,0,B_MINI_ICON-1,B_MINI_ICON-1), B_CMAP8); - fSelectedIconLarge = new BBitmap(BRect(0,0,B_LARGE_ICON-1,B_LARGE_ICON-1), B_CMAP8); - BMimeType type(PRNT_SIGNATURE_TYPE); - type.GetIcon(fSelectedIconMini, B_MINI_ICON); - type.GetIcon(fSelectedIconLarge, B_LARGE_ICON); -#endif PostMessage(PSRV_PRINT_SPOOLED_JOB); // Start handling of spooled files @@ -163,15 +155,8 @@ PrintServerApp::QuitRequested() fHasReferences = 0; } -#ifdef HAIKU_TARGET_PLATFORM_HAIKU delete [] fSelectedIcon; fSelectedIcon = NULL; -#else - delete fSelectedIconMini; - fSelectedIconMini = NULL; - delete fSelectedIconLarge; - fSelectedIconLarge = NULL; -#endif return true; } @@ -485,12 +470,7 @@ PrintServerApp::SelectPrinter(const char* printerName) if (status == B_OK) { // and add the custom icon BNodeInfo info(&node); -#ifdef HAIKU_TARGET_PLATFORM_HAIKU info.SetIcon(fSelectedIcon, fIconSize); -#else - info.SetIcon(fSelectedIconMini, B_MINI_ICON); - info.SetIcon(fSelectedIconLarge, B_LARGE_ICON); -#endif } fDefaultPrinter = Printer::Find(printerName); diff --git a/src/servers/print/PrintServerApp.h b/src/servers/print/PrintServerApp.h index b7ca0a462f..a0a83a3333 100644 --- a/src/servers/print/PrintServerApp.h +++ b/src/servers/print/PrintServerApp.h @@ -92,13 +92,8 @@ private: private: ResourceManager fResourceManager; Printer* fDefaultPrinter; -#ifdef HAIKU_TARGET_PLATFORM_HAIKU size_t fIconSize; uint8* fSelectedIcon; -#else - BBitmap* fSelectedIconMini; - BBitmap* fSelectedIconLarge; -#endif int32 fReferences; sem_id fHasReferences; Settings* fSettings;